partially revert commit b4803118c5e22e7a00d313698868a0ebbe5188ba, making default-windowmanager an cli-only option by not exposing a UI

3 files changed, 15 insertions, 66 deletions

diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp
index d58c2422..eb29ee8f 100644
--- a/lumina-config/mainUI.cpp
+++ b/lumina-config/mainUI.cpp
@@ -117,7 +117,6 @@ void MainUI::setupIcons(){
   ui->tool_session_addapp->setIcon( LXDG::findIcon("system-run","") );
   ui->tool_session_addbin->setIcon( LXDG::findIcon("system-search","") );
   ui->tool_session_addfile->setIcon( LXDG::findIcon("run-build-file","") );
-  ui->tool_session_findwm->setIcon( LXDG::findIcon("system-search","") );
 
 }
 
@@ -194,8 +193,6 @@ void MainUI::setupConnections(){
   connect(ui->check_session_numlock, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) );
   connect(ui->check_session_playloginaudio, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) );
   connect(ui->check_session_playlogoutaudio, SIGNAL(stateChanged(int)), this, SLOT(sessionoptchanged()) );
-  connect(ui->tool_session_findwm, SIGNAL(clicked()), this, SLOT(findsessionwindowmanager()) );
-  connect(ui->line_session_windowmanager, SIGNAL(textChanged(QString)), this, SLOT(sessionoptchanged()) );
   connect(ui->spin_session_wkspaces, SIGNAL(valueChanged(int)), this, SLOT(sessionoptchanged()) );
   connect(ui->list_session_start, SIGNAL(currentRowChanged(int)), this, SLOT(sessionstartchanged()) );
 }
@@ -1346,25 +1343,10 @@ void MainUI::loadSessionSettings(){
   ui->check_session_numlock->setChecked( sessionsettings->value("EnableNumlock", true).toBool() );
   ui->check_session_playloginaudio->setChecked( sessionsettings->value("PlayStartupAudio",true).toBool() );
   ui->check_session_playlogoutaudio->setChecked( sessionsettings->value("PlayLogoutAudio",true).toBool() );
-  ui->line_session_windowmanager->setText( sessionsettings->value("WindowManager","fluxbox").toString() );
 
   sessionstartchanged(); //make sure to update buttons
 }
 
-void MainUI::findsessionwindowmanager(){
-  QString chkpath = LOS::AppPrefix() + "bin";
-  if(!QFile::exists(chkpath)){ chkpath = QDir::homePath(); }
-  QString bin = QFileDialog::getOpenFileName(this, tr("Set Default Window Manager"), chkpath, tr("Application Binaries (*)") );
-  if( bin.isEmpty() || !QFile::exists(bin) ){ return; } //cancelled
-  if( !QFileInfo(bin).isExecutable() ){
-    QMessageBox::warning(this, tr("Invalid Binary"), tr("The selected file is not executable!"));
-    return;
-  }
-  ui->line_session_windowmanager->setText(bin);
-  ui->push_save->setEnabled(true);
-  modses = true;
-}
-
 void MainUI::saveSessionSettings(){
   //Do the fluxbox settings first
   QStringList FB = readFile(QDir::homePath()+"/.lumina/fluxbox-init");
@@ -1404,7 +1386,6 @@ void MainUI::saveSessionSettings(){
   sessionsettings->setValue("EnableNumlock", ui->check_session_numlock->isChecked());
   sessionsettings->setValue("PlayStartupAudio", ui->check_session_playloginaudio->isChecked());
   sessionsettings->setValue("PlayLogoutAudio", ui->check_session_playlogoutaudio->isChecked());
-  sessionsettings->setValue("WindowManager", ui->line_session_windowmanager->text() );
 }
 
 void MainUI::rmsessionstartitem(){
diff --git a/lumina-config/mainUI.h b/lumina-config/mainUI.h
index a7f159b0..565a3c61 100644
--- a/lumina-config/mainUI.h
+++ b/lumina-config/mainUI.h
@@ -145,7 +145,6 @@ private slots:
 	void addsessionstartapp();
 	void addsessionstartbin();
 	void addsessionstartfile();
-	void findsessionwindowmanager();
 	void sessionoptchanged();
 	void sessionthemechanged();
 	void sessionstartchanged();
diff --git a/lumina-config/mainUI.ui b/lumina-config/mainUI.ui
index b23afa4d..f1fd2542 100644
--- a/lumina-config/mainUI.ui
+++ b/lumina-config/mainUI.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>579</width>
-    <height>392</height>
+    <width>573</width>
+    <height>385</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -372,8 +372,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>166</width>
-             <height>92</height>
+             <width>157</width>
+             <height>90</height>
             </rect>
            </property>
            <attribute name="label">
@@ -454,8 +454,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>194</width>
-             <height>107</height>
+             <width>177</width>
+             <height>106</height>
             </rect>
            </property>
            <attribute name="label">
@@ -592,8 +592,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>166</width>
-             <height>92</height>
+             <width>157</width>
+             <height>90</height>
             </rect>
            </property>
            <attribute name="label">
@@ -674,8 +674,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>194</width>
-             <height>107</height>
+             <width>177</width>
+             <height>106</height>
             </rect>
            </property>
            <attribute name="label">
@@ -1083,7 +1083,7 @@
            <string/>
           </property>
           <property name="currentIndex">
-           <number>0</number>
+           <number>2</number>
           </property>
           <widget class="QWidget" name="tab">
            <attribute name="title">
@@ -1112,37 +1112,6 @@
              </widget>
             </item>
             <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_18">
-              <property name="topMargin">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QLabel" name="label_12">
-                <property name="text">
-                 <string>Window Manager</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QLineEdit" name="line_session_windowmanager"/>
-              </item>
-              <item>
-               <widget class="QToolButton" name="tool_session_findwm">
-                <property name="text">
-                 <string>...</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item>
-             <widget class="QLabel" name="label_14">
-              <property name="text">
-               <string>The options in 'Shortcuts' and 'Window System' will only work with fluxbox.</string>
-              </property>
-             </widget>
-            </item>
-            <item>
              <spacer name="verticalSpacer_2">
               <property name="orientation">
                <enum>Qt::Vertical</enum>
@@ -1297,8 +1266,8 @@
                    <rect>
                     <x>0</x>
                     <y>0</y>
-                    <width>491</width>
-                    <height>59</height>
+                    <width>509</width>
+                    <height>71</height>
                    </rect>
                   </property>
                   <property name="sizePolicy">
@@ -1404,8 +1373,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>579</width>
-     <height>19</height>
+     <width>573</width>
+     <height>20</height>
     </rect>
    </property>
   </widget>