New build

MX-Linux · Jan 4, 2025 · 2ddb0e1 · 2ddb0e1
1 parent 1f56271
commit 2ddb0e1
Show file tree

Hide file tree

Showing 40 changed files with 395 additions and 214 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+exit-options (25.1) mx; urgency=medium
+
+  * Add JWM support
+
+ -- Adrian <[email protected]>  Sat, 04 Jan 2025 16:49:48 -0500
+
 exit-options (24.10.01) mx; urgency=medium
 
   * Add restart DE option for IceWM
@@ -8,7 +14,7 @@ exit-options (24.10) mx; urgency=medium
 
   * Generalize 'Exit' to be used in other desktop environments
 
- -- Adrian <adrian@mxlinux.org>  Fri, 11 Oct 2024 21:11:22 -0400
+ -- Adrian <adrianmxlinux.org>  Fri, 11 Oct 2024 21:11:22 -0400
 
 exit-options (24.3) mx; urgency=medium
 

diff --git a/debs/exit-options_24.10.01.dsc b/debs/exit-options_24.10.01.dsc
diff --git a/debs/exit-options_24.10.01.tar.xz b/debs/exit-options_24.10.01.tar.xz
diff --git a/debs/exit-options_25.1.dsc b/debs/exit-options_25.1.dsc
@@ -0,0 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+Format: 3.0 (native)
+Source: exit-options
+Binary: exit-options
+Architecture: any
+Version: 25.1
+Maintainer: Adrian <[email protected]>
+Standards-Version: 3.9.8
+Build-Depends: debhelper (>= 10), qtbase5-dev, qttools5-dev-tools
+Package-List:
+ exit-options deb admin optional arch=any
+Checksums-Sha1:
+ 7f5fd5512d3bd7cf7444c7a4d1000c92b8857728 235956 exit-options_25.1.tar.xz
+Checksums-Sha256:
+ 451708d3205d12b766a7ddbfe0aab1018e6616f45549938fad15e19b3367f395 235956 exit-options_25.1.tar.xz
+Files:
+ cbbc3e7a6b5df518ba4b8f865135fa96 235956 exit-options_25.1.tar.xz
+
+-----BEGIN PGP SIGNATURE-----
+
+iQFHBAEBCgAxFiEE8ndToY6S45N+YzXncJOMeAZ57pgFAmd5rVYTHGFkcmlhbkBt
+eGxpbnV4Lm9yZwAKCRBwk4x4BnnumJKXCACOGvvzI8BbKmgnZGDQpq1J9X022MGo
+9lc20dAMs4mkeCwsDZY3BuDhdAHHOXx19oTLkUD8ksM3zKqrQCWqf0w8zoFZYWgR
+MSPBeeU/v2v42zekN0biL7IGup0TyguASvk0lgsEmw0u+I+OiYOuVqNGsCXJy3el
+SXzGHqLkcZHvTNVm0vvSj0txZ418aYO4s6pfoHEnT405Zi2rjr3q1K+FG+bFuCsj
+t51sri7uoejODm5n3jkTyomRvxYAm7OHoq8E+yw5TylgnAuBsjFga19CXpMVCmtW
+ey5WMUIosfK251+nUPrAC6duzIWhxwx5/QsYdFESX3CK05xpb+mqIbn0
+=S/av
+-----END PGP SIGNATURE-----
diff --git a/debs/exit-options_25.1.tar.xz b/debs/exit-options_25.1.tar.xz
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -26,6 +26,8 @@ MainWindow::MainWindow(const QCommandLineParser &parser, QWidget *parent)
         labelRestartDE = tr("Restart Fluxbox");
     } else if (sessionDesktop == "icewm-session") {
         labelRestartDE = tr("Restart IceWM");
+    } else if (sessionDesktop == "jwm") {
+        labelRestartDE = tr("Restart JWM");
     }
 
     auto *pushRestartDE = createButton("RestartFluxbox", "/usr/share/exit-options/awesome/refresh.png", labelRestartDE,
@@ -48,7 +50,7 @@ MainWindow::MainWindow(const QCommandLineParser &parser, QWidget *parent)
         = horizontal ? static_cast<QLayout *>(new QHBoxLayout(this)) : static_cast<QLayout *>(new QVBoxLayout(this));
 
     // Add pushRestartDE?
-    if (sessionDesktop == "fluxbox" || sessionDesktop == "icewm-session") {
+    if (sessionDesktop == "fluxbox" || sessionDesktop == "icewm-session" || sessionDesktop == "jwm") {
         layout->addWidget(pushRestartDE);
     }
 
@@ -106,11 +108,12 @@ void MainWindow::on_pushExit()
         return QProcess::execute(program, arguments);
     };
 
-    // Map format: {desktop, {program, {arguments}}
+    // Map format: {desktop, {program, {arguments}}}
     static const QMap<QString, QPair<QString, QStringList>> desktopCommands
         = {{"fluxbox", {"fluxbox-remote", {"exit"}}},
            {"xfce", {"xfce4-session-logout", {"--logout"}}},
            {"kde", {"qdbus", {"org.kde.ksmserver", "/KSMServer", "logout", "0", "0", "0"}}},
+           {"jwm", {"jwm", {"-exit"}}},
            {"i3", {"i3-msg", {"exit"}}}};
 
     if (desktopCommands.contains(sessionDesktop)) {
@@ -184,6 +187,8 @@ void MainWindow::on_pushRestartDE()
         QProcess::startDetached("idesktoggle", {"idesk", "refresh"});
     } else if (sessionDesktop == "icewm-session") {
         QProcess::execute("icewm", {"-r"});
+    } else if (sessionDesktop == "jwm") {
+        QProcess::execute("jwm", {"-restart"});
     }
 }
 

diff --git a/translations/exit-options_am.ts b/translations/exit-options_am.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>መመልከቻ መቆለፊያ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>መውጫ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>ማገጃ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>ዳግም ማስጀመሪያ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>ማጥፊያ</translation>
     </message>

diff --git a/translations/exit-options_ca.ts b/translations/exit-options_ca.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
         <translation>Torna a arrencar Fluxbox</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation>Reinicia IceWM</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>Bloca la pantalla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>Finalitza la Sessió</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>Suspèn</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>Reinicia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>Atura</translation>
     </message>

diff --git a/translations/exit-options_cs.ts b/translations/exit-options_cs.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
         <translation>Restartovat Fluxbox</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>Zamknout obrazovku</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>Odhlásit se</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>Uspát</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>Restartovat</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>Vypnout</translation>
     </message>

diff --git a/translations/exit-options_da.ts b/translations/exit-options_da.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>Lås skærm</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>Log ud</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>Suspendér</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>Genstart</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>Luk ned</translation>
     </message>

diff --git a/translations/exit-options_de.ts b/translations/exit-options_de.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
-        <translation>Fluxbox neustarten</translation>
+        <translation>Fluxbox neu starten</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation>IceWM neu starten</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>Bildschirm sperren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>Abmelden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>Bereitschaft</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>Neustart</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>Herunterfahren</translation>
     </message>
@@ -109,7 +114,7 @@ Verwenden Sie -h, --horizontal, um die Schaltflächen horizontal anzuzeigen.</tr
     <message>
         <location filename="../main.cpp" line="69"/>
         <source>You can also use &apos;timeout=off&apos; to turn the timeout off.</source>
-        <translation type="unfinished"/>
+        <translation>Sie können auch den Befehl &quot;timeout=off&quot; verwenden, um das Time-out zu deaktivieren.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="71"/>

diff --git a/translations/exit-options_el.ts b/translations/exit-options_el.ts
@@ -2,32 +2,37 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.cpp" line="24"/>
+        <location filename="../mainwindow.cpp" line="26"/>
         <source>Restart Fluxbox</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="28"/>
+        <source>Restart IceWM</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="36"/>
         <source>Lock Screen</source>
         <translation>Κλείδωμα Οθόνης</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="26"/>
+        <location filename="../mainwindow.cpp" line="34"/>
         <source>Log Out</source>
         <translation>Αποσύνδεση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="34"/>
+        <location filename="../mainwindow.cpp" line="42"/>
         <source>Suspend</source>
         <translation>Αναστολή</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="30"/>
+        <location filename="../mainwindow.cpp" line="38"/>
         <source>Reboot</source>
         <translation>Επανεκκίνηση</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="32"/>
+        <location filename="../mainwindow.cpp" line="40"/>
         <source>Shutdown</source>
         <translation>Τερματισμός</translation>
     </message>