Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

5 files changed, 130 insertions, 79 deletions

diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index 0e2f6f1d3..1b77896d8 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -115,7 +115,9 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
 
 LogitechMouse::~LogitechMouse()
 {
-    usb_close( m_usbDeviceHandle );
+    if (m_usbDeviceHandle != 0) {
+        usb_close( m_usbDeviceHandle );
+    }
 }
 
 void LogitechMouse::initCordlessStatusReporting()
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index d9a995588..10e62fd53 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -87,7 +87,7 @@ void advancedTabDialog::load()
     m_pConfig->setGroup("FMSettings");
     m_advancedWidget->m_pShowMMBInTabs->setChecked( m_pConfig->readBoolEntry( "MMBOpensTab", false ) );
     m_advancedWidget->m_pDynamicTabbarHide->setChecked( !(m_pConfig->readBoolEntry( "AlwaysTabbedMode", false )) );
-    m_advancedWidget->m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", false ) );
+    m_advancedWidget->m_pDynamicTabbarCycle->setChecked( m_pConfig->readBoolEntry( "TabsCycleWheel", true ) );
     m_advancedWidget->m_pNewTabsInBackground->setChecked( ! (m_pConfig->readBoolEntry( "NewTabsInFront", false )) );
     m_advancedWidget->m_pOpenAfterCurrentPage->setChecked( m_pConfig->readBoolEntry( "OpenAfterCurrentPage", false ) );
     m_advancedWidget->m_pPermanentCloseButton->setChecked( m_pConfig->readBoolEntry( "PermanentCloseButton", false ) );
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index bd98ee3f9..788187ca7 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -14,6 +14,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
+
+    --------------------------------------------------------------
+    Additional changes:
+    - 2013/10/22 Michele Calgaro
+      * added support for display mode (Icons and Text, Text only, Icons only)
+        and removed "Show application icons"
  */
 
 #include <tqcheckbox.h>
@@ -151,6 +157,27 @@ TQStringList TaskbarConfig::i18nShowTaskStatesList()
    return i18nList;
 }
 
+// These are the strings that are actually stored in the config file.
+const TQStringList& TaskbarConfig::displayIconsNText()
+{
+    static TQStringList list(TQStringList()
+                << I18N_NOOP("Icons and Text")
+                << I18N_NOOP("Text only")
+                << I18N_NOOP("Icons only"));
+    return list;
+}
+
+// Get a translated version of the above string list.
+TQStringList TaskbarConfig::i18ndisplayIconsNText()
+{
+   TQStringList i18nList;
+   for (TQStringList::ConstIterator it = displayIconsNText().begin(); it != displayIconsNText().end(); ++it)
+   {
+     i18nList << i18n((*it).latin1());
+   }
+   return i18nList;
+}
+
 TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList& args)
   : TDECModule(TaskBarFactory::instance(), parent, name),
     m_settingsObject(NULL)
@@ -211,6 +238,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL
     m_widget->kcfg_LeftButtonAction->insertStringList(list);
     m_widget->kcfg_MiddleButtonAction->insertStringList(list);
     m_widget->kcfg_RightButtonAction->insertStringList(list);
+    m_widget->kcfg_DisplayIconsNText->insertStringList(i18ndisplayIconsNText());
     m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList());
     m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList());
 
diff --git a/kcontrol/taskbar/kcmtaskbar.h b/kcontrol/taskbar/kcmtaskbar.h
index b0fe0c7ea..f14500a68 100644
--- a/kcontrol/taskbar/kcmtaskbar.h
+++ b/kcontrol/taskbar/kcmtaskbar.h
@@ -14,6 +14,12 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
+
+    --------------------------------------------------------------
+    Additional changes:
+    - 2013/10/22 Michele Calgaro
+      * added support for display mode (Icons and Text, Text only, Icons only)
+        and removed "Show application icons"
  */
 
 #ifndef __kcmtaskbar_h__
@@ -84,6 +90,8 @@ private:
     static TQStringList i18nGroupModeList();
     static const TQStringList& showTaskStatesList();
     static TQStringList i18nShowTaskStatesList();
+    static const TQStringList& displayIconsNText();
+    static TQStringList i18ndisplayIconsNText();
     TaskbarConfigUI *m_widget;
     TQString m_configFileName;
     TaskBarSettings* m_settingsObject;
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index 4d655b2a7..94f37f84e 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -98,6 +98,22 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
+                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
+                    <property name="name">
+                        <cstring>kcfg_ShowAllWindows</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Show windows from all desktops</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. 
+
+By default, this option is selected and all windows are shown.</string>
+                    </property>
+                </widget>
                 <widget class="TQCheckBox" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_SortByDesktop</cstring>
@@ -114,22 +130,33 @@
 By default this option is selected.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>kcfg_ShowAllWindows</cstring>
+                        <cstring>showAllScreens</cstring>
                     </property>
                     <property name="text">
-                        <string>&amp;Show windows from all desktops</string>
+                        <string>Show windows from all sc&amp;reens</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; the windows on the current desktop. 
+                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
 
 By default, this option is selected and all windows are shown.</string>
                     </property>
                 </widget>
+                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
+                    <property name="name">
+                        <cstring>kcfg_SortByApp</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Sort alphabeticall&amp;y by application name</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
                 <widget class="TQCheckBox" row="4" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_AllowDragAndDropReArrange</cstring>
@@ -144,7 +171,31 @@ By default, this option is selected and all windows are shown.</string>
                         <string>Turning this option on will allow tasks on the taskbar to be manually rearranged using drag and drop.</string>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="3">
+                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
+                  <property name="name">
+                    <cstring>kcfg_CycleWheel</cstring>
+                  </property>
+                  <property name="text">
+                    <string>Cycle through windows with mouse wheel</string>
+                  </property>
+                  <property name="checked">
+                    <bool>true</bool>
+                  </property>
+                </widget>
+                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
+                    <property name="name">
+                        <cstring>kcfg_ShowOnlyIconified</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Show o&amp;nly minimized windows</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. 
+
+By default, this option is not selected and the taskbar will show all windows.</string>
+                    </property>
+                </widget>
+                <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
                     <property name="name">
                         <cstring>kcfg_ShowWindowListBtn</cstring>
                     </property>
@@ -158,6 +209,33 @@ By default, this option is selected and all windows are shown.</string>
                         <string>Selecting this option causes the taskbar to display a button that, when clicked, shows a list of all windows in a popup menu.</string>
                     </property>
                 </widget>
+                <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>displayIconsNText</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Dis&amp;play:</string>
+                    </property>
+                    <property name="buddy" stdset="0">
+                        <cstring>kcfg_DisplayIconsNText</cstring>
+                    </property>
+                </widget>
+                <widget class="TQComboBox" row="8" column="2">
+                    <property name="name">
+                        <cstring>kcfg_DisplayIconsNText</cstring>
+                    </property>
+                    <property name="sizePolicy">
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                            <horstretch>0</horstretch>
+                            <verstretch>0</verstretch>
+                        </sizepolicy>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Choose taskbar display mode among &lt;strong&gt;Icons and text&lt;/strong&gt;, &lt;strong&gt;Text only&lt;/strong&gt; and &lt;strong&gt;Icons only&lt;/strong&gt;.</string>
+                    </property>
+                </widget>
                 <widget class="TQComboBox" row="9" column="2">
                     <property name="name">
                         <cstring>kcfg_GroupTasks</cstring>
@@ -180,13 +258,13 @@ By default the taskbar groups windows when it is full.</string>
                 </widget>
                 <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2">
                     <property name="name">
-			    <cstring>groupTasksLabel</cstring>
+			                  <cstring>groupTasksLabel</cstring>
                     </property>
                     <property name="text">
                         <string>&amp;Group similar tasks:</string>
                     </property>
                     <property name="buddy" stdset="0">
-                        <cstring>kcfg_ShowTaskStates</cstring>
+                        <cstring>kcfg_GroupTasks</cstring>
                     </property>
                 </widget>
                 <widget class="TQComboBox" row="10" column="2">
@@ -202,7 +280,7 @@ By default the taskbar groups windows when it is full.</string>
                         </sizepolicy>
                     </property>
                     <property name="whatsThis" stdset="0">
-			    <string>The taskbar can show and/or hide tasks based on their current process state.  Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
+			                  <string>The taskbar can show and/or hide tasks based on their current process state.  Select &lt;em&gt;Any&lt;/em&gt; to show all tasks regardless of current state.</string>
                     </property>
                 </widget>
                 <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2">
@@ -210,57 +288,12 @@ By default the taskbar groups windows when it is full.</string>
                         <cstring>showTaskStatesLabel</cstring>
                     </property>
                     <property name="text">
-			    <string>&amp;Show tasks with state:</string>
+			                  <string>&amp;Show tasks with state:</string>
                     </property>
                     <property name="buddy" stdset="0">
                         <cstring>kcfg_ShowTaskStates</cstring>
                     </property>
                 </widget>
-                <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowOnlyIconified</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show o&amp;nly minimized windows</string>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Select this option if you want the taskbar to display &lt;b&gt;only&lt;/b&gt; minimized windows. 
-
-By default, this option is not selected and the taskbar will show all windows.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_ShowIcon</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Sho&amp;w application icons</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Select this option if you want window icons to appear along with their titles in the taskbar.
-
-By default this option is selected.</string>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>showAllScreens</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Show windows from all sc&amp;reens</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                    <property name="whatsThis" stdset="0">
-                        <string>Turning this option off will cause the taskbar to display &lt;b&gt;only&lt;/b&gt; windows which are on the same Xinerama screen as the taskbar.
-
-By default, this option is selected and all windows are shown.</string>
-                    </property>
-                </widget>
                 <widget class="TQComboBox" row="11" column="2">
                     <property name="name">
                         <cstring>appearance</cstring>
@@ -426,28 +459,6 @@ By default, this option is selected and all windows are shown.</string>
                         </size>
                     </property>
                 </spacer>
-                <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3">
-                    <property name="name">
-                        <cstring>kcfg_SortByApp</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Sort alphabeticall&amp;y by application name</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="3">
-                  <property name="name">
-                    <cstring>kcfg_CycleWheel</cstring>
-                  </property>
-                  <property name="text">
-                    <string>Cycle through windows with mouse wheel</string>
-                  </property>
-                  <property name="checked">
-                    <bool>true</bool>
-                  </property>
-                </widget>
             </grid>
         </widget>
         <widget class="TQGroupBox">
@@ -567,9 +578,11 @@ By default, this option is selected and all windows are shown.</string>
     <tabstop>kcfg_SortByDesktop</tabstop>
     <tabstop>showAllScreens</tabstop>
     <tabstop>kcfg_SortByApp</tabstop>
+    <tabstop>kcfg_AllowDragAndDropReArrange</tabstop>
+    <tabstop>kcfg_CycleWheel</tabstop>
     <tabstop>kcfg_ShowOnlyIconified</tabstop>
-    <tabstop>kcfg_ShowIcon</tabstop>
     <tabstop>kcfg_ShowWindowListBtn</tabstop>
+    <tabstop>kcfg_DisplayIconsNText</tabstop>
     <tabstop>kcfg_GroupTasks</tabstop>
     <tabstop>kcfg_ShowTaskStates</tabstop>
     <tabstop>appearance</tabstop>