Turn off the custom theme engine for the 1.x desktop itself, and use the lthemeengine styles for everything now.

Also commit a few simple fixes for the lthemeengine styles page and a couple other random tweaks.

2 files changed, 52 insertions, 6 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
index ae5350ab..cd88fb56 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.cpp
@@ -29,6 +29,8 @@ QSSPage::QSSPage(QWidget *parent, bool desktop) : TabPage(parent), m_ui(new Ui::
   m_ui->createButton->setIcon(QIcon::fromTheme("document-new"));
   m_ui->editButton->setIcon(QIcon::fromTheme("accessories-text-editor"));
   m_ui->removeButton->setIcon(QIcon::fromTheme("edit-delete"));
+  m_ui->tool_enable->setEnabled(false);
+  m_ui->tool_disable->setEnabled(false);
 }
 
 QSSPage::~QSSPage(){
@@ -50,8 +52,10 @@ void QSSPage::on_qssListWidget_currentItemChanged(QListWidgetItem *current, QLis
   if(current!=0){
     m_ui->list_disabled->clearSelection(); //clear any current selection on the other widget
     m_ui->list_disabled->setCurrentRow(-1);
+    m_ui->tool_enable->setEnabled(false);
   }
   //qDebug() << "Got Current Item Changed";
+  m_ui->tool_disable->setEnabled(current!=0);
   if(current){
     m_ui->editButton->setEnabled(current->data(QSS_WRITABLE_ROLE).toBool());
     m_ui->removeButton->setEnabled(current->data(QSS_WRITABLE_ROLE).toBool());
@@ -68,8 +72,10 @@ void QSSPage::on_list_disabled_currentItemChanged(QListWidgetItem *current, QLis
   if(current!=0){
     m_ui->qssListWidget->clearSelection(); //clear any current selection on the other widget
     m_ui->qssListWidget->setCurrentRow(-1);
+    m_ui->tool_disable->setEnabled(false);
   }
   //qDebug() << "Got Current Item Changed";
+  m_ui->tool_enable->setEnabled(current!=0);
   if(current){
     m_ui->editButton->setEnabled(current->data(QSS_WRITABLE_ROLE).toBool());
     m_ui->removeButton->setEnabled(current->data(QSS_WRITABLE_ROLE).toBool());
@@ -105,11 +111,11 @@ void QSSPage::on_createButton_clicked(){
   file.close();
   //creating item
   QFileInfo info(filePath);
-  QListWidgetItem *item = new QListWidgetItem(info.fileName(),  m_ui->qssListWidget);
+  QListWidgetItem *item = new QListWidgetItem(info.fileName(),  m_ui->list_disabled);
   item->setToolTip(info.filePath());
   item->setData(QSS_FULL_PATH_ROLE, info.filePath());
   item->setData(QSS_WRITABLE_ROLE, info.isWritable());
-  m_ui->qssListWidget->setCurrentRow(m_ui->qssListWidget->count()-1);
+  m_ui->list_disabled->setCurrentRow(m_ui->list_disabled->count()-1);
   QTimer::singleShot(10, this, SLOT(on_editButton_clicked()) );
 }
 
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.ui b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.ui
index 108bbbf9..f9a980f3 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.ui
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/qsspage.ui
@@ -22,6 +22,12 @@
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <item>
           <widget class="QToolButton" name="tool_priority_up">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="toolTip">
             <string>Increase Priority</string>
            </property>
@@ -29,12 +35,19 @@
             <string notr="true"/>
            </property>
            <property name="icon">
-            <iconset theme="arrow-up"/>
+            <iconset theme="arrow-up">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="tool_priority_down">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="toolTip">
             <string>Decrease priority of style</string>
            </property>
@@ -42,12 +55,19 @@
             <string notr="true"/>
            </property>
            <property name="icon">
-            <iconset theme="arrow-down"/>
+            <iconset theme="arrow-down">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -61,6 +81,12 @@
          </item>
          <item>
           <widget class="QToolButton" name="tool_disable">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="toolTip">
             <string>Disable Style</string>
            </property>
@@ -68,7 +94,8 @@
             <string>Disable</string>
            </property>
            <property name="icon">
-            <iconset theme="arrow-right"/>
+            <iconset theme="arrow-right">
+             <normaloff>.</normaloff>.</iconset>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -120,11 +147,18 @@
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
           <widget class="QToolButton" name="tool_enable">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
             <string>Enable</string>
            </property>
            <property name="icon">
-            <iconset theme="arrow-left"/>
+            <iconset theme="arrow-left">
+             <normaloff>.</normaloff>.</iconset>
            </property>
            <property name="toolButtonStyle">
             <enum>Qt::ToolButtonTextBesideIcon</enum>
@@ -133,6 +167,12 @@
          </item>
          <item>
           <spacer name="horizontalSpacer_3">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>