Merge pull request #8 from hakaishi/rework_program_starter

Rework program starter

debian/changelog

@@ -1,3 +1,28 @@
+shutdown-qapps (1.8.0-1) unstable; urgency=low
+ * qshutdown
+  - increased time-skip-check to 30 seconds. If your system goes to sleep
+    etc. please wait 30 seconds until you wakeup or start your system again.
+  - changed default settings and log file location. See the info window for
+    more information.
+  - added default value instead of "0"
+  - added custom icons for system tray (because of heavy trouble under
+    Ubuntu/Xubuntu etc.)
+  - fixed calendar date problems
+  - fixed message box "bad window" message
+  - disable "warinings on" as default
+ * qprogram-starter
+  - replaced second text editor with more efficient functinality
+    (see below)
+  - run each line in the text editor as a separate process unless
+    the line ends with a backslash
+  - the default settings and log files location has changed (see
+    the info window for more information)
+  - added command history
+  - fixed message box "bad window" message
+  - revision of button names / tooltip texts etc.
+
+ -- Christian Metscher <[email protected]>  Wed, 06 May 2020 22:55:29 +0900
+
 shutdown-qapps (1.7.4-1) unstable; urgency=low
 
   - switched to QT 5

debian/control

@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Christian Metscher <[email protected]>
 Build-Depends: debhelper (>= 9), qtbase5-dev, qttools5-dev-tools, qt5-qmake:native
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Vcs-Git: https://github.com/hakaishi/shutdown-qapps.git
 Vcs-browser: https://github.com/hakaishi/shutdown-qapps
 Homepage: https://launchpad.net/~hakaishi

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: shutdown-qapps
 Source: https://launchpad.net/qt-shutdown-p/shutdown-qapps/debian-release
 
 Files: *
-Copyright: 2019 Christian Metscher <[email protected]>
+Copyright: 2020 Christian Metscher <[email protected]>
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

debian/qprogram-starter.1

@@ -1,21 +1,23 @@
-.TH qprogram-starter 1 "2010-09-29"
+.TH qprogram-starter 1 "2020-05-04"
 .SH NAME
 qprogram-starter \- A program starter tool
 .SH SYNOPSIS
 .B qprogram-starter
 .br
 .SH DESCRIPTION
 .B qprogram-starter
-is a simple Qt4 program to start a program or process. If you like with the options to set a start date, to log output and errors, and to shutdown after finish.
+is a simple Qt5 program to start a program or process. If you like, there are options to set a start date, to log output and errors, and to shutdown after finish.
+.PP
+Every line in the text editor is handled (and logged) as a serperate process unless the line ends with a backslash.
 .PP
 This program uses qdbus to send a shutdown request to the gnome- or kde-session-manager. If it won't do gnome-power-cmd or gnome-power-cmd.sh will be used. When this also fails then qdbus will send the shutdown request to HAL or ConsoleKit (note that when sending the request to HAL or ConsoleKit the session will never be saved). And if this won't do as well, the sudo shutdown command will be used. In this case you need root-rights, so one can to do the following:
 .PP
 Post the following in a terminal:
 "EDITOR=nano sudo \-E visudo" and add this line:
 "* ALL = NOPASSWD:/sbin/shutdown" whereas * replaces the username or %groupname.
 .PP
-.SH Configurationfile qprogram-starter.conf
-The configurationfile (and logfiles) is located at ~/.qprogram-starter
+.SH Configurationfile
+The configurationfile's (and logfiles) location can be seen in the info window inside the app
 .PP
 .SH KNOWN ISSUES
 .PP

debian/qprogram-starter.docs

@@ -1,2 +1,2 @@
-qprogram-starter/README
+qprogram-starter/README.md
 qprogram-starter/NEWS

debian/qshutdown.1

@@ -1,16 +1,16 @@
 .\"Created with GNOME Manpages Editor
-.TH qshutdown 1 "2013-04-20"
+.TH qshutdown 1 "2020-05-04"
 .PP
 .SH NAME
-qshutdown \- An avanced shutdown tool
+qshutdown \- An advanced shutdown tool
 .PP
 .SH SYNOPSIS
 .B qshutdown
 .RI [ options ]
 .br
 .PP
 .SH DESCRIPTION
-qshutdown  is  a simple tool to choose a time or a number of minutes to shutdown, reboot, suspend or hibernate after.
+qshutdown is a simple tool to choose a time or a number of minutes to shutdown, reboot, suspend or hibernate after.
 .PP
 qshutdown will show itself 3 times as a warning if there are less  than 70  seconds  left.  (if  1 Minute or local time +1 Minute was set it'll appear only once.)
 .PP
@@ -46,15 +46,15 @@ If you want qshutdown to run with "parental lock" for every user, you can do
 .PP
 \& $ sudo cp /usr/share/qshutdown/autostart/99qshutdown /etc/X11/Xsession.d/
 .PP
-and set the option Lock_all in \fI/root/.qshutdown/qshutdown.conf\fR to \fBtrue\fR. Note that qshutdown has to start once  to generate the qshutdown.conf. Furthermore there is a need to do
+and set the option Lock_all in the root users settings file to \fBtrue\fR. Note that qshutdown has to start once to generate the settings file. Furthermore there is a need to do
 .PP
 \& $ EDITOR=nano sudo \-E visudo
 .PP
 and add the following line to the sudoers:
 .PP
 \& * ALL = NOPASSWD:/usr/bin/qshutdown
 .PP
-If you should ever forget your set password, just remove the whole line starting with \fBPassword\fR manually from the qshutdown.conf.
+If you should ever forget your set password, just remove the whole line starting with \fBPassword\fR manually from the settings file.
 .PP
 .SH FILES
 The configurationfile (and logfile) is located at \fI~/.qshutdown/\fR (under Linux/Unix).

debian/qshutdown.docs

@@ -1,2 +1,2 @@
-qshutdown/README
+qshutdown/README.md
 qshutdown/NEWS

debian/upstream/metadata

@@ -1,6 +1,5 @@
-Name: qshutdown
 Repository: https://github.com/hakaishi/shutdown-qapps.git
 Repository-Browse: https://github.com/hakaishi/shutdown-qapps
 Contact: Christian Metscher <[email protected]>
 Reference: 
- Author: Christian Metscher
+ Author: Christian Metscher

qprogram-starter/NEWS

@@ -1,3 +1,16 @@
+Changes in Release 1.8.0
+=========================
+
+ - replaced second text editor with more efficient functinality
+   (see below)
+ - run each line in the text editor as a separate process unless
+   the line ends with a backslash
+ - the default settings and log files location has changed (see
+   the info window for more information)
+ - added command history
+ - other small fixes
+
+
 Changes in Release 1.7.0
 =========================
 

qprogram-starter/README → qprogram-starter/README.md

@@ -1,28 +1,26 @@
-qprogram-starter
-
+# qprogram-starter
 
+## INSTALL
 Dependencies: qtbase5-dev, qttools5-dev-tools, build-essential
 
 
 If you want to install from source, open a terminal and change into this folder.
 To install type:
 
-qmake
-sudo make install distclean
-
-
+`qmake`
+`sudo make install distclean`
 
+## UNINSTALL
 To uninstall type:
 
-qmake     (if the Makefile has been removed)
-sudo make deinstall
+`qmake`     (if the Makefile has been removed)
+`sudo make deinstall`
 
-(note that ~/.qprogram-starter/qprogram-starter.conf and
+(please note that the users qprogram-starter settings file and
  the log files won't be removed)
 
 
-KNOWN ISSUE:
-=============
+## KNOWN ISSUE:
 
 For most systems using the Gnome Shell a certain DBus method has been removed,
 thus a shutdown dialog will be likely to appear if qshutdown's methods have

qprogram-starter/autostart/qprogram-starter.desktop

@@ -7,3 +7,4 @@ Type=Application
 Icon=qprogram-starter
 Categories=Utility;
 Name[en_US]=qprogram-starter
+Comment=A program starter with shutdown options, start time setting etc

qprogram-starter/qprogram-starter.pro

@@ -17,9 +17,9 @@ system(lrelease qprogram-starter.pro)
 QMAKE_DISTCLEAN = src/translations/*.qm
 
 # Input
-HEADERS = src/gui.h src/preferences.h
-FORMS = src/ui/gui.ui src/ui/preferences.ui
-SOURCES = src/main.cpp src/gui.cpp src/preferences.cpp
+HEADERS = src/gui.h src/preferences.h src/history.h
+FORMS = src/ui/gui.ui src/ui/preferences.ui src/ui/history.ui
+SOURCES = src/main.cpp src/gui.cpp src/preferences.cpp src/history.cpp
 RESOURCES = ../qprogram-starter.qrc
 TRANSLATIONS = src/translations/qprogram-starter-ast.ts\
                src/translations/qprogram-starter-bs.ts\