TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update tqt3

Browse Source
pull/3/head
François Andriot 10 years ago
parent 473c7cd7fa
commit df34b5611a
10 changed files with 2 additions and 637 deletions
Show Stats Download Patch File Download Diff File

3
redhat/dependencies/tqt3/tqt3-14.0.0.spec
Unescape View File

@ -1500,7 +1500,7 @@ done
%suse_update_desktop_file tqassistant Documentation %suse_update_desktop_file tqassistant Documentation
%suse_update_desktop_file tqdesigner GUIDesigner %suse_update_desktop_file tqdesigner GUIDesigner
%suse_update_desktop_file tqlinguist Translation %suse_update_desktop_file tqlinguist Translation
%suse_update_desktop_file tqtconfig Settings %suse_update_desktop_file tqtconfig Utility
%endif %endif
# Install applications icons # Install applications icons
@ -1550,6 +1550,7 @@ install -D -m 755 %{SOURCE1} %{?buildroot}%{_docdir}/tqt3-examples/build-example
tar cvvfz tqt3-examples.tar.gz tqt3-examples/ tar cvvfz tqt3-examples.tar.gz tqt3-examples/
install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz" install -D -m644 "tqt3-examples.tar.gz" "%{?buildroot}%{_docdir}/tqt3-examples/tqt3-examples.tar.gz"
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}

20
redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
Unescape View File

@ -1,20 +0,0 @@
--- trinity-tdebase-14.0.0~pre737+02bf1e69/starttde.ORI 2013-07-07 20:01:47.656584924 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/starttde 2013-07-07 20:04:37.039608089 +0200
@@ -347,6 +347,17 @@
fi
fi
+# Default Start Button icon for TDE
+if [ ! -e "$tdehome/share/config/kickerrc" ]; then
+ if [ -r "%{tde_starticon}" ]; then
+ [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config"
+ cat <<EOF >"$tdehome/share/config/kickerrc"
+[KMenu]
+CustomIcon=%{tde_starticon}
+EOF
+ fi
+fi
+
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver.
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"

34
redhat/tdebase/tdebase-14.0.0-fix_twin_rules_translation.patch
Unescape View File

@ -1,34 +0,0 @@
--- trinity-tdebase/twin/data/update_default_rules.cpp.ORI 2013-07-27 11:49:19.337804333 +0200
+++ trinity-tdebase/twin/data/update_default_rules.cpp 2013-07-27 19:12:32.144222960 +0200
@@ -15,12 +15,18 @@
#include <kdebug.h>
#include <kinstance.h>
#include <kstandarddirs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeglobal.h>
int main( int argc, char* argv[] )
{
if( argc != 2 )
return 1;
- TDEInstance inst( "twin_update_default_rules" );
+ TDEAboutData about( "twin_update_default_rules", I18N_NOOP("TWin"), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ) );
+ TDECmdLineArgs::init( argc, argv, &about );
+ TDEInstance inst( &about );
+ Q_UNUSED( TDEGlobal::locale() ); // jump-start locales to get to translated desriptions
TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
if( file.isEmpty())
{
@@ -43,8 +49,10 @@
dest_cfg.setGroup( TQString::number( pos ));
for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
it != entries.end();
- ++it )
+ ++it ) {
+ printf("DEBUG: %s\n", it.key().latin1());
dest_cfg.writeEntry( it.key(), *it );
+ }
}
dest_cfg.setGroup( "General" );
dest_cfg.writeEntry( "count", pos );

136
redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch
Unescape View File

@ -1,136 +0,0 @@
--- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200
+++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200
@@ -33,6 +33,8 @@
#include <tdeio/netaccess.h>
#include <ktar.h>
+#include "../../krdb/krdb.h"
+
#include <tqlayout.h>
#include <tqdir.h>
#include <tqpixmap.h>
@@ -42,6 +44,7 @@
#include <tqpainter.h>
#include <tqfileinfo.h>
#include <tqpushbutton.h>
+#include <dcopref.h>
#include <cstdlib> // for getenv()
@@ -53,6 +56,10 @@
#include <X11/Xlib.h>
#include <X11/Xcursor/Xcursor.h>
+#ifdef HAVE_XFIXES
+# include <X11/extensions/Xfixes.h>
+#endif
+
// Check for older version
#if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
# define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
@@ -133,6 +140,65 @@
{
}
+bool ThemePage::applyTheme(TQString theme, TQString size)
+{
+#ifdef HAVE_XCURSOR
+ if (theme.isEmpty()) {
+ return false;
+ }
+
+ // Apply the TDE cursor theme to ourselves
+ XcursorSetTheme(tqt_xdisplay(), theme.latin1());
+
+ // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
+ // variables when launching applications.
+ DCOPRef tdelauncher("tdelauncher");
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), TQFile::encodeName(theme));
+ if( !size.isEmpty()) {
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
+ }
+
+ // Update the Xcursor X resources
+ runRdb(0);
+
+ // Apply the TDE cursor size to ourselves
+ if (!size.isEmpty()) {
+ XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt());
+ }
+
+ // Reload the standard cursors
+ TQStringList names;
+
+ // Qt cursors
+ names << "left_ptr" << "up_arrow" << "cross" << "wait"
+ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor"
+ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v"
+ << "split_h" << "pointing_hand" << "openhand"
+ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link";
+
+ // X core cursors
+ names << "X_cursor" << "right_ptr" << "hand1"
+ << "hand2" << "watch" << "xterm"
+ << "crosshair" << "left_ptr_watch" << "center_ptr"
+ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur"
+ << "top_left_corner" << "top_side" << "top_right_corner"
+ << "right_side" << "bottom_right_corner" << "bottom_side"
+ << "bottom_left_corner" << "left_side" << "question_arrow"
+ << "pirate";
+
+ for (int i = 0; i < names.size(); ++i)
+ {
+ const char* name = (*(names.at(i))).ascii();
+ Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), name);
+ XFixesChangeCursorByName(tqt_xdisplay(), handle, TQFile::encodeName(name));
+ XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
+ }
+
+ return true;
+#else // HAVE_XCURSOR
+ return false;
+#endif
+}
void ThemePage::save()
{
@@ -145,10 +209,17 @@
c.setGroup( "Mouse" );
c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
- KMessageBox::information( this, i18n("You have to restart TDE for these "
+ // The Kcontrol panel does not allow to set cursor size for now.
+ // So we keep the same size as written in config file.
+ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
+
+ if (!applyTheme(selectedTheme, size))
+ {
+ KMessageBox::information( this, i18n("You have to restart TDE for these "
"changes to take effect."), i18n("Cursor Settings Changed"),
"CursorSettingsChanged" );
-
+ }
+
currentTheme = selectedTheme;
}
--- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200
+++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200
@@ -45,6 +45,7 @@
void load();
void load( bool useDefaults );
void defaults();
+ bool applyTheme(TQString theme, TQString size);
signals:
void changed( bool );
--- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200
+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200
@@ -21,5 +21,6 @@
tde_add_library( themepage STATIC_PIC AUTOMOC
SOURCES
- themepage.cpp previewwidget.cpp
+ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
+ LINK Xfixes
)

48
redhat/tdebase/tdebase-14.0.0-konsole_wordseps.patch
Unescape View File

@ -1,48 +0,0 @@
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:56:40.070802259 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/kcontrol/konsole/kcmkonsole.cpp 2013-07-10 07:58:53.680465150 +0200
@@ -107,7 +107,7 @@
dialog->frameCB->setChecked(config.readBoolEntry("has frame",true));
dialog->line_spacingSB->setValue(config.readUnsignedNumEntry( "LineSpacing", 0 ));
dialog->silence_secondsSB->setValue(config.readUnsignedNumEntry( "SilenceSeconds", 10 ));
- dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~"));
+ dialog->word_connectorLE->setText(config.readEntry("wordseps",":@-./_~+"));
dialog->metaAsAltModeCB->setChecked(config.readBoolEntry("metaAsAltMode",false));
dialog->SchemaEditor1->setSchema(config.readEntry("schema"));
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole.cpp 2013-07-10 07:58:53.698465376 +0200
@@ -1573,7 +1573,7 @@
b_warnQuit=config->readBoolEntry( "WarnQuit", true );
b_allowResize=config->readBoolEntry( "AllowResize", false);
b_bidiEnabled = config->readBoolEntry("EnableBidi",false);
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
b_framevis = config->readBoolEntry("has frame",true);
b_metaAsAlt = config->readBoolEntry("metaAsAltMode",false);
TQPtrList<TEWidget> tes = activeTEs();
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/konsole_part.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/konsole_part.cpp 2013-07-10 07:58:53.684465202 +0200
@@ -565,7 +565,7 @@
n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session
n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
- s_word_seps= config->readEntry("wordseps",":@-./_~");
+ s_word_seps= config->readEntry("wordseps",":@-./_~+");
n_encoding = config->readNumEntry("encoding",0);
TQFont tmpFont = TDEGlobalSettings::fixedFont();
diff -Nuar trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp
--- trinity-tdebase-14.0.0~pre737+02bf1e69.ORI/konsole/konsole/TEWidget.cpp 2013-07-10 07:56:40.112802782 +0200
+++ trinity-tdebase-14.0.0~pre737+02bf1e69/konsole/konsole/TEWidget.cpp 2013-07-10 07:58:53.690465276 +0200
@@ -352,7 +352,7 @@
,preserve_line_breaks(true)
,column_selection_mode(false)
,scrollLoc(SCRNONE)
-,word_characters(":@-./_~")
+,word_characters(":@-./_~+")
,m_bellMode(BELLSYSTEM)
,blinking(false)
,cursorBlinking(false)

16
redhat/tdebase/tdebase-14.0.0-mandriva_use_drakclock.patch
Unescape View File

@ -1,16 +0,0 @@
--- ./kicker/applets/clock/clock.cpp.orig 2014-09-13 20:24:15.429011133 +0200
+++ ./kicker/applets/clock/clock.cpp 2014-09-13 20:25:02.281084675 +0200
@@ -1515,11 +1515,8 @@
preferences();
break;
case 103:
- proc << locate("exe", "tdesu");
- proc << "--nonewdcop";
- proc << TQString("%1 tde-clock.desktop --lang %2")
- .arg(locate("exe", "tdecmshell"))
- .arg(TDEGlobal::locale()->language());
+ // Mageia/Mandriva only
+ proc << locate("exe", "drakclock");
proc.start(TDEProcess::DontCare);
break;
case 104:

20
redhat/tdebase/tdebase-14.0.0-open_terminal_here.patch
Unescape View File

@ -1,20 +0,0 @@
--- tdebase/kdesktop/krootwm.cc.openterminalhere 2013-07-24 21:45:14.083030776 +0200
+++ tdebase/kdesktop/krootwm.cc 2013-07-26 17:37:34.561203115 +0200
@@ -132,7 +132,7 @@
if (kapp->authorize("run_command"))
{
new TDEAction(i18n("Run Command..."), "run", 0, TQT_TQOBJECT(m_pDesktop), TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
- new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
+ new TDEAction(i18n("Open Terminal..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ),
m_actionCollection, "open_terminal" );
}
@@ -760,7 +760,7 @@
TDEConfigGroupSaver gs(TDEGlobal::config(), "General");
TQString terminal = TDEGlobal::config()->readPathEntry("TerminalApplication", "konsole");
- *p << terminal << "--workdir=" + TDEGlobalSettings::desktopPath() + "/";
+ *p << terminal;
p->start(TDEProcess::DontCare);

151
redhat/tdebase/tdebase-14.0.0-suspend_unmount.patch
Unescape View File

@ -1,151 +0,0 @@
--- ./tdeioslave/media/libmediacommon/medium.cpp.ori 2013-05-08 22:57:09.317384423 +0200
+++ ./tdeioslave/media/libmediacommon/medium.cpp 2013-05-08 22:57:36.730837358 +0200
@@ -46,6 +46,7 @@
loadUserLabel();
m_halmounted = false;
+ m_isHotplug = false;
}
Medium::Medium()
@@ -69,6 +70,7 @@
m_properties+= "false"; /* HIDDEN */
m_halmounted = false;
+ m_isHotplug = false;
}
const Medium Medium::create(const TQStringList &properties)
--- ./tdeioslave/media/libmediacommon/medium.h.ORI 2013-05-08 22:59:10.772959829 +0200
+++ ./tdeioslave/media/libmediacommon/medium.h 2013-05-08 22:59:56.602044404 +0200
@@ -92,6 +92,9 @@
void setHalMounted(bool flag) const { m_halmounted = flag; }
bool halMounted() const { return m_halmounted; }
+ void setIsHotplug( bool state ) { m_isHotplug = state; }
+ bool isHotplug() const { return m_isHotplug; }
+
//private:
Medium();
@@ -100,6 +103,8 @@
TQStringList m_properties;
mutable bool m_halmounted;
+
+ bool m_isHotplug;
friend class TQValueListNode<const Medium>;
};
--- ./tdeioslave/media/mediamanager/mediamanager.cpp.ori 2013-05-08 23:00:39.673183801 +0200
+++ ./tdeioslave/media/mediamanager/mediamanager.cpp 2013-05-08 23:04:47.639224260 +0200
@@ -354,6 +354,57 @@
emit mediumChanged(name);
}
+TQString MediaManager::unmountAllSuspend()
+{
+ TQPtrList<Medium> list = m_mediaList.list();
+
+ TQPtrList<Medium>::const_iterator it = list.begin();
+ TQPtrList<Medium>::const_iterator end = list.end();
+
+ TQString result;
+
+ for (; it!=end; ++it)
+ {
+ if ( (*it)->isMounted() && (*it)->isHotplug() )
+ {
+ TQString tmp = unmount( (*it)->id() );
+ if ( !tmp.isEmpty() ) { // umount failed
+ result = tmp;
+ } else {
+ m_suspendResumeMountList.append( (*it)->id() );
+ }
+ }
+ }
+
+ // return last error
+ return result;
+}
+
+TQString MediaManager::remountAllResume()
+{
+ TQString result;
+
+ for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
+ it != m_suspendResumeMountList.end();
+ ++it)
+ {
+ const Medium *m = m_mediaList.findById(*it);
+
+ if ( m && m->needMounting() )
+ {
+ TQString tmp = mount( *it );
+ if ( !tmp.isEmpty() ) { // mount failed
+ result = tmp;
+ }
+ }
+ }
+
+ m_suspendResumeMountList.clear();
+
+ // return last error
+ return result;
+}
+
extern "C" {
KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)
--- ./tdeioslave/media/mediamanager/mediamanager.h.ORI 2013-05-08 23:05:36.250251036 +0200
+++ ./tdeioslave/media/mediamanager/mediamanager.h 2013-05-08 23:07:27.650019601 +0200
@@ -60,6 +60,20 @@
bool removableUnplug(const TQString &devNode);
bool removableCamera(const TQString &devNode);
+ /**
+ * Unmount manually all partitions when going to suspend
+ *
+ * @return last error if any
+ */
+ TQString unmountAllSuspend();
+
+ /**
+ * Remount previously unmounted partitions in unmountAllSuspend()
+ *
+ * @return last error if any
+ */
+ TQString remountAllResume();
+
k_dcop_signals:
void mediumAdded(const TQString &name, bool allowNotification);
void mediumRemoved(const TQString &name, bool allowNotification);
@@ -89,6 +103,7 @@
TDEBackend *m_tdebackend;
MediaDirNotify m_dirNotify;
FstabBackend *m_fstabbackend;
+ TQStringList m_suspendResumeMountList;
};
#endif
--- ./tdeioslave/media/mediamanager/halbackend.cpp.ori 2013-05-08 23:08:12.196126863 +0200
+++ ./tdeioslave/media/mediamanager/halbackend.cpp 2013-05-08 23:08:51.096347073 +0200
@@ -541,6 +541,7 @@
libhal_volume_is_mounted(halVolume) ); /* Mounted ? */
}
+ medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
TQString volume_name = TQString::fromUtf8(name);
--- ./tdeioslave/media/mediamanager/halbackend.h.ORI 2013-05-08 23:09:35.761451488 +0200
+++ ./tdeioslave/media/mediamanager/halbackend.h 2013-05-08 23:10:21.608531952 +0200
@@ -89,6 +89,8 @@
TQString decrypt(const TQString &id, const TQString &password);
TQString undecrypt(const TQString &id);
+ static bool isHotplug( const TQString & id );
+
private:
/**
* Append a device in the media list. This function will check if the device

25
redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
Unescape View File

@ -1,25 +0,0 @@
--- tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp.new 2013-11-11 21:27:09.960234089 +0100
+++ tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp 2013-11-11 21:32:16.081679386 +0100
@@ -979,9 +979,21 @@
}
if (valids.contains("utf8")) {
- value = config.readBoolEntry("utf8", true);
+ // From "man mount": only some filesystems support 'iocharset' option.
+ if( (sdevice->fileSystemName() == "fat")
+ || (sdevice->fileSystemName() == "iso9660")
+ || (sdevice->fileSystemName() == "jfs")
+ || (sdevice->fileSystemName() == "msdos")
+ || (sdevice->fileSystemName() == "ntfs")
+ || (sdevice->fileSystemName() == "umsdos")
+ || (sdevice->fileSystemName() == "vfat")
+ ) {
+ value = config.readBoolEntry("utf8", true);
+ } else {
+ value = false;
+ }
tmp = TQString("utf8=%1").arg(value ? "true" : "false");
result << tmp;
}
if (valids.contains("shortname")) {

186
redhat/tdebase/tdebase-14.0.0-vibrate_dialog.patch
Unescape View File

@ -1,186 +0,0 @@
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h.ORI 2013-05-14 22:12:18.159235590 +0200
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.h 2013-05-14 22:12:56.657422259 +0200
@@ -58,6 +58,7 @@
void slotLock( bool );
void slotDelaySaverStart( bool );
void slotUseTSAK( bool );
+ void slotVibrateUnlock( bool );
void slotUseUnmanagedLockWindows( bool );
void slotHideActiveWindowsFromSaver( bool );
void slotHideCancelButton( bool );
@@ -102,6 +103,7 @@
TQGroupBox *mSettingsGroup;
TQCheckBox *mDelaySaverStartCheckBox;
TQCheckBox *mUseTSAKCheckBox;
+ TQCheckBox *mVibrateUnlockCheckBox;
TQCheckBox *mUseUnmanagedLockWindowsCheckBox;
TQCheckBox *mHideActiveWindowsFromSaverCheckBox;
TQCheckBox *mHideCancelButtonCheckBox;
@@ -121,6 +123,7 @@
bool mImmutable;
bool mDelaySaverStart;
bool mUseTSAK;
+ bool mVibrateUnlock;
bool mUseUnmanagedLockWindows;
bool mHideActiveWindowsFromSaver;
bool mHideCancelButton;
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp.vibrate_dialog 2013-04-26 22:15:23.000000000 +0200
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kcontrol/screensaver/scrnsave.cpp 2013-05-14 22:24:37.354375502 +0200
@@ -271,6 +271,13 @@
settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1);
TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") );
+ mVibrateUnlockCheckBox = new TQCheckBox( i18n("&Vibrate unlock dialog box on failure"), mSettingsGroup );
+ mVibrateUnlockCheckBox->setEnabled( true );
+ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
+ connect( mVibrateUnlockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotVibrateUnlock( bool ) ) );
+ settingsGroupLayout->addWidget(mVibrateUnlockCheckBox, 4, 1);
+ TQWhatsThis::add( mVibrateUnlockCheckBox, i18n("Makes the unlock dialog box vibrate when entering an incorrect password.") );
+
mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup );
mHideCancelButtonCheckBox->setEnabled( true );
mHideCancelButtonCheckBox->setChecked( mHideCancelButton );
@@ -437,6 +444,7 @@
mLock = config->readBoolEntry("Lock", false);
mDelaySaverStart = config->readBoolEntry("DelaySaverStart", true);
mUseTSAK = config->readBoolEntry("UseTDESAK", true);
+ mVibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
mUseUnmanagedLockWindows = config->readBoolEntry("UseUnmanagedLockWindows", false);
mHideActiveWindowsFromSaver = config->readBoolEntry("HideActiveWindowsFromSaver", true);
mHideCancelButton = config->readBoolEntry("HideCancelButton", false);
@@ -490,6 +498,7 @@
config->writeEntry("Lock", mLock);
config->writeEntry("DelaySaverStart", mDelaySaverStart);
config->writeEntry("UseTDESAK", mUseTSAK);
+ config->writeEntry("VibrateUnlock", mVibrateUnlock);
config->writeEntry("UseUnmanagedLockWindows", mUseUnmanagedLockWindows);
config->writeEntry("HideActiveWindowsFromSaver", mHideActiveWindowsFromSaver);
config->writeEntry("HideCancelButton", mHideCancelButton);
@@ -705,10 +714,14 @@
mUseTSAKCheckBox->setChecked( false );
}
if (!mUseUnmanagedLockWindows) {
+ mVibrateUnlockCheckBox->setEnabled( true );
+ mVibrateUnlockCheckBox->setChecked( mVibrateUnlock );
mHideActiveWindowsFromSaverCheckBox->setEnabled( true );
mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver );
}
else {
+ mVibrateUnlockCheckBox->setEnabled( false );
+ mVibrateUnlockCheckBox->setChecked( false );
mHideActiveWindowsFromSaverCheckBox->setEnabled( false );
mHideActiveWindowsFromSaverCheckBox->setChecked( false );
}
@@ -969,6 +982,16 @@
processLockouts();
mChanged = true;
emit changed(true);
+}
+
+//---------------------------------------------------------------------------
+//
+void KScreenSaver::slotVibrateUnlock( bool u )
+{
+ if (mVibrateUnlockCheckBox->isEnabled()) mVibrateUnlock = u;
+ processLockouts();
+ mChanged = true;
+ emit changed(true);
}
//---------------------------------------------------------------------------
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.h 2013-05-14 22:42:50.562878532 +0200
@@ -60,6 +60,7 @@
void slotOK();
void layoutClicked();
void slotActivity();
+ void moveTimerDone();
protected slots:
virtual void reject();
@@ -79,6 +80,8 @@
void handleVerify();
void reapVerify();
void cantCheck();
+ void movedialog( int _move );
+ void badPasswordLogin();
GreeterPluginHandle *mPlugin;
KGreeterPlugin *greet;
TQFrame *frame;
@@ -95,6 +98,8 @@
int sPid, sFd;
TQListView *lv;
TQDateTime m_lockStartDT;
+ bool waitMoveDialog;
+ bool VibrateUnlock;
};
#endif
--- trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc.vibrate_dialog 2013-01-09 02:12:13.000000000 +0100
+++ trinity-tdebase-3.5.13.2~pre102+43d29f86/kdesktop/lock/lockdlg.cc 2013-05-14 22:42:12.809621715 +0200
@@ -55,6 +55,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <fixx11h.h>
+#include <tdeapplication.h>
#ifndef AF_LOCAL
# define AF_LOCAL AF_UNIX
@@ -246,6 +247,11 @@
mLayoutButton->hide(); // no kxkb running
}
capsLocked();
+
+ TDEConfig* config = new TDEConfig("kdesktoprc");
+ config->setGroup("ScreenSaver");
+ VibrateUnlock = config->readBoolEntry("VibrateUnlock", true);
+ delete config;
}
PasswordDlg::~PasswordDlg()
@@ -302,6 +308,37 @@
}
}
+void PasswordDlg::movedialog( int _move )
+{
+ waitMoveDialog = true;
+ this->move(pos().x()+_move, pos().y());
+ TQTimer::singleShot( 50, this, TQT_SLOT(moveTimerDone()) );
+ while (waitMoveDialog) {
+ kapp->processEvents();
+ }
+}
+
+void PasswordDlg::moveTimerDone()
+{
+ waitMoveDialog = false;
+}
+
+void PasswordDlg::badPasswordLogin()
+{
+ if ( VibrateUnlock && mUnlockingFailed )
+ {
+ for ( int i = 0 ; i<2 ; i++)
+ {
+ movedialog( 10 );
+ movedialog( -20 );
+ movedialog( 20 );
+ movedialog( -20 );
+ movedialog( 20 );
+ movedialog( -10 );
+ }
+ }
+}
+
//---------------------------------------------------------------------------
//
// Handle timer events.
@@ -442,6 +479,7 @@
mFailedTimerId = startTimer(1500);
ok->setEnabled(false);
mNewSessButton->setEnabled( false );
+ badPasswordLogin();
return;
case AuthAbort:
return;
Write Preview
Loading…
Cancel
Save