diff options
| -rw-r--r-- | kdesktop/kdesktop.kcfg | 2 | ||||
| -rw-r--r-- | kdesktop/minicli.cpp | 12 | ||||
| -rw-r--r-- | kdesktop/minicli.h | 1 | ||||
| -rw-r--r-- | kdesktop/minicli_ui.ui | 14 |
4 files changed, 26 insertions, 3 deletions
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg index bf74c5f3b..3994f5f89 100644 --- a/kdesktop/kdesktop.kcfg +++ b/kdesktop/kdesktop.kcfg @@ -379,7 +379,7 @@ <!-- m_dlg->cbAutocomplete->setChecked( KDesktopSettings::miniCLIFilesystemAutoComplete() ); --> </entry> <entry key="MiniCLISystempathAutoComplete" type="Bool"> - <default>true</default> + <default>false</default> <label></label> <whatsthis></whatsthis> <!-- minicli.cpp:216 --> diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index af79c93af..f60eff4a5 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -127,7 +127,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) // Autocomplete system m_filesystemAutocomplete = 0; m_histfilesystemAutocomplete = 0; - m_systempathAutocomplete = 1; + m_systempathAutocomplete = 0; m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion); m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion); //m_pURLCompletion->setCompletionMode( KGlobalSettings::completionMode() ); @@ -153,6 +153,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool))); connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int))); connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool))); + connect(m_dlg->cbAppcomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAppcompleteToggled(bool))); connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool))); connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool))); connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool))); @@ -219,6 +220,7 @@ void Minicli::loadConfig() m_dlg->cbCommand->blockSignals( block ); m_dlg->cbAutocomplete->setChecked( KDesktopSettings::miniCLIFilesystemAutoComplete() ); + m_dlg->cbAppcomplete->setChecked( KDesktopSettings::miniCLISystempathAutoComplete() ); m_dlg->cbAutohistory->setChecked( KDesktopSettings::miniCLIHistoryAndFilesystemAutoComplete() ); m_filesystemAutocomplete = KDesktopSettings::miniCLIFilesystemAutoComplete(); @@ -1013,6 +1015,14 @@ void Minicli::slotAutocompleteToggled(bool enabled) m_dlg->cbCommand->setCurrentText( current_text ); // Force an update of the autocompletion list } +void Minicli::slotAppcompleteToggled(bool enabled) +{ + m_systempathAutocomplete = enabled; + + TQString current_text = m_dlg->cbCommand->currentText(); + m_dlg->cbCommand->setCurrentText( current_text ); // Force an update of the autocompletion list +} + void Minicli::slotAutohistoryToggled(bool enabled) { if (enabled) diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h index 1024a9819..bfc141124 100644 --- a/kdesktop/minicli.h +++ b/kdesktop/minicli.h @@ -78,6 +78,7 @@ private slots: void slotParseTimer(); void slotPriority(int); void slotRealtime(bool); + void slotAppcompleteToggled(bool); void slotAutocompleteToggled(bool); void slotAutohistoryToggled(bool); void slotTerminal(bool); diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 52e5a3d49..1de313bd1 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -182,6 +182,18 @@ </widget> <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="4"> <property name="name"> + <cstring>cbAppcomplete</cstring> + </property> + <property name="text"> + <string>Autocomplete shows available &applications</string> + </property> + <property name="whatsThis" stdset="0"> + <string><qt>When enabled, the system shows available applications in the autocompletion area. + </qt></string> + </property> + </widget> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="4"> + <property name="name"> <cstring>cbAutocomplete</cstring> </property> <property name="text"> @@ -192,7 +204,7 @@ </qt></string> </property> </widget> - <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cbAutohistory</cstring> </property> |