Bug#597243: unblock: shutdown-qapps/1.4.4-1
Hi release team,
I've attached a debdiff file for more information about the changes
since version 1.2.5-1. I hope it helps.
Kind regards
Christian Metscher
diff -Nru shutdown-qapps-1.2.5/debian/changelog shutdown-qapps-1.4.4/debian/changelog
--- shutdown-qapps-1.2.5/debian/changelog 2010-09-20 14:29:03.000000000 +0200
+++ shutdown-qapps-1.4.4/debian/changelog 2010-09-13 22:47:40.000000000 +0200
@@ -1,3 +1,118 @@
+shutdown-qapps (1.4.4-1) unstable; urgency=low
+
+ * fixed: if no date was set and the clock turned 12:00 AM
+ qshutdown stopped working because the date was intern set to the
+ current day.
+ * minor changes in Gui::showCalendarBox()
+ * .ui files had wrong .qrc path (fixed)
+
+ -- Christian Metscher <hakaishi@web.de> Sun, 12 Sep 2010 02:01:16 +0200
+
+
+shutdown-qapps (1.4.3-1) unstable; urgency=low
+
+ * corrected a spelling mistake in qprogram-starter
+ * added a new version control for qshutdown
+ * and some minor changes
+
+ -- Christian Metscher <hakaishi@web.de> Sat, 04 Sep 2010 01:22:08 +0200
+
+
+shutdown-qapps (1.4.2-1) unstable; urgency=low
+
+ * a little modification for the file browser (qprogram-starter)
+
+ -- Christian Metscher <hakaishi@web.de> Mon, 30 Aug 2010 02:58:25 +0200
+
+
+shutdown-qapps (1.4.1-1) unstable; urgency=low
+
+ * bug in time calculation fixed (qprogram-starter)
+
+ -- Christian Metscher <hakaishi@web.de> Mon, 30 Aug 2010 01:56:58 +0200
+
+
+shutdown-qapps (1.4.0-1) unstable; urgency=low
+
+ * the DateTimeEdit from qprogram-starter was replaced through a
+ date and a time edit
+ * the date and time are now at minimum the current date and time
+ * there are now browse buttons to choose a program binary
+ * one can now save the command he/she wants to
+ * the output is now devided into four files: two output and two
+ error output files, because there are two processes
+
+ -- Christian Metscher <hakaishi@web.de> Sun, 29 Aug 2010 23:05:08 +0200
+
+
+shutdown-qapps (1.3.7-1) unstable; urgency=low
+
+ * repacked "upstream" orig.tar.gz
+
+ -- Christian Metscher <hakaishi@web.de> Wed, 25 Aug 2010 09:13:31 +0200
+
+
+shutdown-qapps (1.3.6-1) unstable; urgency=low
+
+ * the upload of version 1.3.5-1 was faulty
+
+ -- Christian Metscher <hakaishi@web.de> Tue, 24 Aug 2010 02:04:01 +0200
+
+
+shutdown-qapps (1.3.5-1) unstable; urgency=low
+
+ * bugfix for timeEdit
+
+ -- Christian Metscher <hakaishi@web.de> Tue, 24 Aug 2010 01:35:01 +0200
+
+
+shutdown-qapps (1.3.4-1) unstable; urgency=low
+
+ * fix for toolButton
+ * bugfix for spinBox
+
+ -- Christian Metscher <hakaishi@web.de> Mon, 23 Aug 2010 13:03:15 +0200
+
+
+shutdown-qapps (1.3.3-1) unstable; urgency=low
+
+ * new design for preferences
+
+ -- Christian Metscher <hakaishi@web.de> Sun, 22 Aug 2010 23:46:02 +0200
+
+
+shutdown-qapps (1.3.2-1) unstable; urgency=low
+
+ * fixed and modified many things
+
+ -- Christian Metscher <hakaishi@web.de> Sun, 22 Aug 2010 17:16:01 +0200
+
+
+shutdown-qapps (1.3.1-1) unstable; urgency=low
+
+ * adjusted some things in the calendar widget
+ * corrected quite a lot things
+ * made some code cleanups
+
+ -- Christian Metscher <hakaishi@web.de> Sun, 22 Aug 2010 12:54:00 +0200
+
+
+shutdown-qapps (1.3.0-1) unstable; urgency=low
+
+ * new Standards-Version 3.9.1
+ * new features: added a calendar and the changes of the font settings
+ take immediantly effect in the main window
+
+ -- Christian Metscher <hakaishi@web.de> Sat, 21 Aug 2010 08:53:17 +0200
+
+
+shutdown-qapps (1.2.5-2) unstable; urgency=low
+
+ * new Standards-Version 3.9.0
+
+ -- Christian Metscher <hakaishi@web.de> Wed, 30 Jun 2010 07:08:00 +0200
+
+
shutdown-qapps (1.2.5-1) unstable; urgency=low
*bugfix: Programwindow didn't reappear when starting twice
diff -Nru shutdown-qapps-1.2.5/debian/control shutdown-qapps-1.4.4/debian/control
--- shutdown-qapps-1.2.5/debian/control 2010-06-30 07:01:20.000000000 +0200
+++ shutdown-qapps-1.4.4/debian/control 2010-09-13 11:05:00.000000000 +0200
@@ -3,12 +3,12 @@
Priority: optional
Maintainer: Christian Metscher <hakaishi@web.de>
Build-Depends: debhelper (>= 7), libqt4-dev, libqt4-dbus
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: https://launchpad.net/~hakaishi
Package: qprogram-starter
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt program to start programs or commands
qprogram-starter is a Qt program to start programs or commands. You can
set a time or date when the processes should start, log error output
@@ -18,7 +18,7 @@
Package: qshutdown
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt program to shutdown/reboot/suspend/hibernate the system
qshutdown is a Qt program to shutdown/reboot/suspend/hibernate the
computer at a given time or after a certain number of minutes. It shows
diff -Nru shutdown-qapps-1.2.5/debian/copyright shutdown-qapps-1.4.4/debian/copyright
--- shutdown-qapps-1.2.5/debian/copyright 2010-09-20 14:29:21.000000000 +0200
+++ shutdown-qapps-1.4.4/debian/copyright 2010-09-12 02:01:32.000000000 +0200
@@ -1,6 +1,6 @@
This package was debianized by:
- Christian Metscher <hakaishi@web.de> on Sun, 20 Jun 2010 14:58:37 +0200
+ Christian Metscher <hakaishi@web.de> on Sun, 12 Sep 2010 02:01:16 +0200
Upstream Author:
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/autostart/qprogram-starter.desktop shutdown-qapps-1.4.4/qprogram-starter/autostart/qprogram-starter.desktop
--- shutdown-qapps-1.2.5/qprogram-starter/autostart/qprogram-starter.desktop 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/autostart/qprogram-starter.desktop 2010-09-12 11:43:00.000000000 +0200
@@ -4,5 +4,5 @@
Exec=qprogram-starter
Terminal=false
Type=Application
-Icon=/usr/share/pixmaps/qprogram-starter.xpm
+Icon=qprogram-starter
Categories=Utility;
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/NEWS shutdown-qapps-1.4.4/qprogram-starter/NEWS
--- shutdown-qapps-1.2.5/qprogram-starter/NEWS 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/NEWS 2010-09-04 01:48:56.000000000 +0200
@@ -1,3 +1,36 @@
+Changes in Release 1.4.3
+=========================
+
+ - corrected a spelling mistake
+ - some minor changes
+
+Changes in Release 1.4.2
+=========================
+
+ - a little modification for the
+ file browser
+
+Changes in Release 1.4.1
+=========================
+
+ - bug in time calculation fixed
+
+Changes in Release 1.4.0
+=========================
+
+ - the dateTimeEdit was replaced
+ trough a date and a time edit
+ - the date and time are now at
+ minimum the current date and time
+ - there are now browse buttons to
+ choose a program binary
+ - one can now save the command
+ he/she wants to
+ - the output is now devided into
+ four files: two output and two
+ error output files, because
+ there are two processes
+
Changes in Release 1.2.0
=========================
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/qprogram-starter.pro shutdown-qapps-1.4.4/qprogram-starter/qprogram-starter.pro
--- shutdown-qapps-1.2.5/qprogram-starter/qprogram-starter.pro 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/qprogram-starter.pro 2010-09-03 19:59:10.000000000 +0200
@@ -1,7 +1,7 @@
QT += dbus
TEMPLATE = app
TARGET = bin/qprogram-starter
-DEPENDPATH = . src src/ui src/locale
+DEPENDPATH = . src src/locale
INCLUDEPATH = . src
OBJECTS_DIR = build
MOC_DIR = build
@@ -12,7 +12,7 @@
HEADERS = src/gui.h
FORMS = src/ui/gui.ui
SOURCES = src/main.cpp src/gui.cpp
-RESOURCES = src/resource.qrc
+RESOURCES = ../qprogram-starter.qrc
TRANSLATIONS = src/locale/de.ts
# install
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/gui.cpp shutdown-qapps-1.4.4/qprogram-starter/src/gui.cpp
--- shutdown-qapps-1.2.5/qprogram-starter/src/gui.cpp 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/gui.cpp 2010-09-04 00:16:42.000000000 +0200
@@ -15,8 +15,6 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef GUI_CPP
-#define GUI_CPP
#include "gui.h"
@@ -24,87 +22,158 @@
setupUi(this);
- dateTimeEdit->setDateTime(QDateTime::currentDateTime()); //For displaying the current time
+ process2Started = false;
+
+ dateTimeTimer = new QTimer(this);
+ dateTimeTimer->start(1000);
+
timer = new QTimer(this);
- process = new QProcess(this);
+
+ process1 = new QProcess(this);
process2 = new QProcess(this);
- hintMsgBox = new QPlainTextEdit;
+ file = QDir::homePath() + "/.qprogram-starter/qprogram-starter.conf";
+ settings = new QSettings(file, QSettings::IniFormat);
+
+ hintMsgBox = new QTextEdit;
hintMsgBox->setReadOnly(true);
- hintMsgBox->resize(500,450);
+ hintMsgBox->resize(520,450);
hintMsgBox->setWindowTitle("Info");
hintMsgBox->setWindowModality(Qt::NonModal);
- hintMsgBox->setPlainText(tr("The command in the second textbox (if there is any) will be executed after the first one. The message boxes will close themselves after 10 seconds.\n\nTo start a program just type i.e. \"firefox\" or \"firefox www.google.com\" and then click on OK.\n\nIf the process is \"finished\" while it is still running, then try the --nofork option (i.e. kopete --nofork). Note that this will also occure for some programs like gedit, firefox or gnome-terminal if they are already running.\n\nWhen you want to start a program or command with sudo, please use i.e. gksudo.\n\nmake examples:\n make -C /path/to/project\n make clean -C /path/to/project\n\nIf the shutdown won't work, it means that \"sudo shutdown -P now\" is used. This needs root permissions, so one needs to do the following:\n\nPost the following in a terminal:\n\"EDITOR:nano sudo -E visudo\" and add this line:\n\"* ALL = NOPASSWD:/sbin/shutdown\" whereas * replaces the username or %groupname.\n\nThe configuration- and logging-files can be found at ~/.qprogram-starter/"));
+ hintMsgBox->setHtml(tr("The command in the second text editor (if there is any) will be executed after the first one. The message boxes will close themselves after 10 seconds.<br/>To start a program just type i.e. \"firefox\" or \"firefox www.google.com\" and then click on OK.<br/><br/>If the process is \"finished\" although it is still running, then try the --nofork option (i.e. kopete --nofork). Note that this will also occure for some programs like gedit, firefox or gnome-terminal if they are already running.<br/><br/>When you want to start a program or command with sudo, please use i.e. gksudo.<br/><br/>make examples:<br/> make -C /path/to/project<br/> make clean -C /path/to/project<br/><br/>About Errors:<br/>Because almost every program gives a different error code, it is impossible to say what happend. So just log the output and see what kind of error occured. The output files can be found at <i>~/.qprogram-starter/</i>.<br/><br/>If the shutdown won't work, it means that \"sudo shutdown -P now\" is used. This needs root permissions. You can do the this:<br/><br/>Post the following in a terminal:<pre>EDITOR:nano sudo -E visudo</pre> and add this line:<pre>* ALL = NOPASSWD:/sbin/shutdown</pre> whereas * replaces the username or %groupname.<br/><br/>The configuration-file can be found at <i>~/.qprogram-starter/</i>."));
+ connect(dateTimeTimer, SIGNAL(timeout()), this, SLOT(currentDateAndTime()));
connect(buttons, SIGNAL(accepted()), this, SLOT(run()));
+ connect(saveButton, SIGNAL(clicked(bool)), this, SLOT(saveData()));
connect(timer, SIGNAL(timeout()), this, SLOT(check()));
- connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(output()));
- connect(process, SIGNAL(readyReadStandardError()), this, SLOT(errorOutput()));
- connect(process, SIGNAL(finished(int)), this, SLOT(checkForProcess2()));
- connect(process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(message()));
- connect(process2, SIGNAL(readyReadStandardOutput()), this, SLOT(output()));
- connect(process2, SIGNAL(readyReadStandardError()), this, SLOT(errorOutput()));
+ connect(browse1, SIGNAL(clicked(bool)), this, SLOT(getProgram1()));
+ connect(browse2, SIGNAL(clicked(bool)), this, SLOT(getProgram2()));
+ connect(process1, SIGNAL(readyReadStandardOutput()), this, SLOT(output1()));
+ connect(process1, SIGNAL(readyReadStandardError()), this, SLOT(errorOutput1()));
+ connect(process1, SIGNAL(finished(int)), this, SLOT(checkForProcess2()));
+ connect(process1, SIGNAL(error(QProcess::ProcessError)), this, SLOT(message()));
+ connect(process2, SIGNAL(readyReadStandardOutput()), this, SLOT(output2()));
+ connect(process2, SIGNAL(readyReadStandardError()), this, SLOT(errorOutput2()));
connect(process2, SIGNAL(finished(int)), this, SLOT(shutdown_or_message()));
connect(process2, SIGNAL(error(QProcess::ProcessError)), this, SLOT(message()));
connect(this, SIGNAL(finished()), this, SLOT(shutdown_or_message()));
connect(hint, SIGNAL(clicked(bool)), this, SLOT(info_hint()));
}
-Gui::~Gui(){}
+Gui::~Gui(){ delete hintMsgBox; }
+
+void Gui::closeEvent(QCloseEvent* window_close){
+ if(!settings->isWritable())
+ qCritical() << "W: qprogram-starter.conf is not writeable!";
+ else
+ settings->setValue("CheckBoxes/atDate", atDateCheckBox->isChecked());
+ settings->setValue("CheckBoxes/logging", loggingCheckBox->isChecked());
+ settings->setValue("CheckBoxes/shutdown", shutdownCheckBox->isChecked());
+ settings->setValue("CheckBoxes/quitWithLasProcess", quitCheckBox->isChecked());
+ qApp->quit();
+ QWidget::closeEvent(window_close);
+}
+
+void Gui::currentDateAndTime(){
+ dateEdit->setMinimumDate(QDate::currentDate());
+ if(dateEdit->date() == QDate::currentDate())
+ timeEdit->setMinimumTime(QTime::currentTime());
+ else
+ timeEdit->setMinimumTime(QTime(00,00));
+}
void Gui::info_hint(){ hintMsgBox->show(); }
void Gui::check(){ //To check if start time is reached
- timeInTheFuture = dateTimeEdit->dateTime();
secondsToTimeInTheFuture = QDateTime::currentDateTime().secsTo(timeInTheFuture);
- textEdit->setDisabled(true);
- atDateCheckBox->setDisabled(true);
- dateTimeEdit->setDisabled(true);
if(secondsToTimeInTheFuture == 0){
- process->start(textEdit->toPlainText());
+ process1->start(textEdit->toPlainText());
timer->stop();
}
}
+void Gui::getProgram1(){
+ program1 = QFileDialog::getOpenFileName(this, tr("Select a program"), "/usr/bin");
+ textEdit->insertPlainText(program1);
+}
+
+void Gui::getProgram2(){
+ program2 = QFileDialog::getOpenFileName(this, tr("Select a program"), "/usr/bin");
+ textEdit2->insertPlainText(program2);
+}
+
void Gui::run(){ //To start either the timer or start the process
- if(atDateCheckBox->isChecked() && !textEdit->toPlainText().isEmpty())
- timer->start(1000);
- else if(!textEdit->toPlainText().isEmpty()){
- process->start(textEdit->toPlainText());
+ if(!textEdit->toPlainText().isEmpty()){
+ nextDate = dateEdit->dateTime();
+ timeInTheFuture = nextDate.addSecs(timeEdit->time().hour()*3600 + timeEdit->time().minute()*60 + timeEdit->time().second());
textEdit->setDisabled(true);
atDateCheckBox->setDisabled(true);
- dateTimeEdit->setDisabled(true);
+ dateEdit->setDisabled(true);
+ timeEdit->setDisabled(true);
+ if(atDateCheckBox->isChecked())
+ timer->start(1000);
+ else
+ process1->start(textEdit->toPlainText());
+ }
+ else{
+ QMessageBox msgBox;
+ msgBox.setWindowTitle("Error");
+ msgBox.setIcon(QMessageBox::Warning);
+ msgBox.setWindowFlags(Qt::WindowStaysOnTopHint | Qt::Window);
+ msgBox.setInformativeText(tr("The first text edit is empty!"));
+ QTimer::singleShot(6000, &msgBox, SLOT(close()));
+ msgBox.exec();
}
}
void Gui::checkForProcess2(){ //check if there is a second command
- if((process->exitCode()==0) && (!textEdit2->toPlainText().isEmpty())){
+ if(process1->exitCode()==0 && process1->exitStatus()==0 && process1->error()==5
+ && !textEdit2->toPlainText().isEmpty()){
process2->start(textEdit2->toPlainText());
+ process2Started = true;
textEdit2->setDisabled(true);
}
else
finished();
}
-void Gui::output(){ //write output into a file if loggingCheckBox is checked
+void Gui::output1(){ //write output into a file if loggingCheckBox is checked
+ if(loggingCheckBox->isChecked()){
+ QFile outputLog1(QDir::homePath() + "/.qprogram-starter/outputLog1.txt");
+ if(!outputLog1.open(QIODevice::Append))
+ return;
+ outputLog1.write(process1->readAllStandardOutput());
+ outputLog1.close();
+ }
+}
+
+void Gui::output2(){ //write output into a file if loggingCheckBox is checked
if(loggingCheckBox->isChecked()){
- QFile outputLog(QDir::homePath() + "/.qprogram-starter/outputLog.txt");
- if(!outputLog.open(QIODevice::Append))
+ QFile outputLog2(QDir::homePath() + "/.qprogram-starter/outputLog2.txt");
+ if(!outputLog2.open(QIODevice::Append))
return;
- outputLog.write(process->readAllStandardOutput());
- outputLog.write(process2->readAllStandardOutput());
- outputLog.close();
+ outputLog2.write(process2->readAllStandardOutput());
+ outputLog2.close();
}
}
-void Gui::errorOutput(){ //write error output into a file if loggingCheckBox is checked
+void Gui::errorOutput1(){ //write error output into a file if loggingCheckBox is checked
if(loggingCheckBox->isChecked()){
- QFile errorLog(QDir::homePath() + "/.qprogram-starter/errorLog.txt");
- if(!errorLog.open(QIODevice::Append))
+ QFile errorLog1(QDir::homePath() + "/.qprogram-starter/errorLog1.txt");
+ if(!errorLog1.open(QIODevice::Append))
return;
- errorLog.write(process->readAllStandardError());
- errorLog.write(process2->readAllStandardError());
- errorLog.close();
+ errorLog1.write(process1->readAllStandardError());
+ errorLog1.close();
+ }
+}
+
+void Gui::errorOutput2(){ //write error output into a file if loggingCheckBox is checked
+ if(loggingCheckBox->isChecked()){
+ QFile errorLog2(QDir::homePath() + "/.qprogram-starter/errorLog2.txt");
+ if(!errorLog2.open(QIODevice::Append))
+ return;
+ errorLog2.write(process2->readAllStandardError());
+ errorLog2.close();
}
}
@@ -155,62 +224,98 @@
}
void Gui::message(){
- QMessageBox msgBox;
- if(((process->exitCode()==254)||(process->error()==1)||
- (process->error()==0)||(process->exitCode()==1))||
- ((process2->exitCode()==254)||(process2->error()==1)||
- (process2->error()==0)||(process2->exitCode()==1))){
- msgBox.setWindowTitle("Error");
- msgBox.setIcon(QMessageBox::Critical);
- if((process->exitCode()==254)||(process2->exitCode()==254))
- msgBox.setInformativeText("Failed to start!\n"
- "Wrong arguments or options.");
- if((process->error()==0)||(process2->error()==0))
- msgBox.setInformativeText("Failed to start!\n"
- "No such program or command.");
- if(((process->error()==1)||(process->exitCode()==1))||
- ((process2->error()==1)||(process2->exitCode()==1)))
- msgBox.setInformativeText("Process crashed");
- }
- else{
- msgBox.setWindowTitle("Information");
+ QMessageBox msgBox;
+ if(process1->exitCode()==0 && process1->exitStatus()==0 && process1->error()==5){
+ if(textEdit2->toPlainText().isEmpty()){
+ msgBox.setWindowTitle(tr("Information"));
msgBox.setIcon(QMessageBox::Information);
- if(((process->exitCode()==0) && (!shutdownCheckBox->isChecked()))||
- ((process2->exitCode()==0) && (!shutdownCheckBox->isChecked())))
- msgBox.setInformativeText("Process finished");
+ msgBox.setInformativeText(tr("<b>process 1 finished!</b>"));
}
- msgBox.setWindowModality(Qt::NonModal);
- msgBox.setWindowFlags(Qt::WindowStaysOnTopHint);
- QTimer::singleShot(10000, &msgBox, SLOT(close()));
- msgBox.exec();
+ }
+ if(process2Started && process2->exitCode()==0 && process2->exitStatus()==0 && process2->error()==5){
+ msgBox.setWindowTitle(tr("Information"));
+ msgBox.setIcon(QMessageBox::Information);
+ msgBox.setInformativeText(tr("<b>process 1 & 2 finished!</b>"));
+ }
+ if((process1->exitCode()!=0 || process1->error()!=5) ||
+ (process2->exitCode()!=0 || process2->error()!=5)){
+ msgBox.setWindowTitle(tr("Error"));
+ msgBox.setIcon(QMessageBox::Critical);
+ if(process1->error()==0 || process2->error()==0){
+ msgBox.setInformativeText(tr("<b>Failed to start!</b><br/>"
+ "No such program or command."));
+ if(loggingCheckBox->isChecked()){
+ if(process1->error()==0){
+ QFile errorLog1(QDir::homePath() + "/.qprogram-starter/errorLog1.txt");
+ if(!errorLog1.open(QIODevice::Append))
+ return;
+ QTextStream err1(&errorLog1);
+ err1 << "\"" << textEdit->toPlainText() << "\"" << tr(": Failed to start! No such program or command.\n");
+ errorLog1.close();
+ }
+
+ if(process2->error()==0){
+ QFile errorLog2(QDir::homePath() + "/.qprogram-starter/errorLog2.txt");
+ if(!errorLog2.open(QIODevice::Append))
+ return;
+ QTextStream err2(&errorLog2);
+ err2 << "\"" << textEdit2->toPlainText() << "\"" << tr(": Failed to start! No such program or command.\n");
+ errorLog2.close();
+ }
+ }
+ }
+ else if(process1->error()==1 || process1->exitCode()==1)
+ msgBox.setInformativeText(tr("<b>process 1 crashed!</b><br/>"
+ "This could be caused by invalid parameters or options."));
+ else if(process2->error()==1 || process2->exitCode()==1)
+ msgBox.setInformativeText(tr("<b>process 2 crashed!</b><br/>"
+ "This could be caused by invalid parameters or options."));
+ else
+ msgBox.setInformativeText(tr("<b>Unknown error!</b><br/>"
+ "This could be caused by invalid parameters or options."));
+ }
+ msgBox.setWindowModality(Qt::NonModal);
+ msgBox.setWindowFlags(Qt::WindowStaysOnTopHint);
+ QTimer::singleShot(10000, &msgBox, SLOT(close()));
+ msgBox.exec();
+
+ atDateCheckBox->setEnabled(true);
+ if(atDateCheckBox->isChecked()){
+ dateEdit->setEnabled(true);
+ timeEdit->setEnabled(true);
+ }
+ textEdit->setEnabled(true);
+ textEdit2->setEnabled(true);
- textEdit->setEnabled(true);
- atDateCheckBox->setEnabled(true);
- if(atDateCheckBox->isChecked())
- dateTimeEdit->setEnabled(true);
- textEdit2->setEnabled(true);
+ if(quitCheckBox->isChecked())
+ close();
+}
- if(quitCheckBox->isChecked())
- close();
+void Gui::saveData(){
+ settings->setValue("Text/text1", textEdit->toPlainText());
+ settings->setValue("Text/text2", textEdit2->toPlainText());
}
void Gui::loadSettings(){
- QString file(QDir::homePath() + "/.qprogram-starter/qprogram-starter.conf");
- QSettings settings(file, QSettings::NativeFormat);
if(!QFile::exists(file)){ //if path or file doesn't exist
- settings.setValue("CheckBoxes/atDate", false);
- settings.setValue("CheckBoxes/logging", false);
- settings.setValue("CheckBoxes/shutdown", false);
- settings.setValue("CheckBoxes/quitWithLasProcess", false);
- settings.setValue("Text/text", QString());
+ if(!settings->contains("CheckBoxes/atDate"))
+ settings->setValue("CheckBoxes/atDate", false);
+ if(!settings->contains("CheckBoxes/logging"))
+ settings->setValue("CheckBoxes/logging", false);
+ if(!settings->contains("CheckBoxes/shutdown"))
+ settings->setValue("CheckBoxes/shutdown", false);
+ if(!settings->contains("CheckBoxes/quitWithLasProcess"))
+ settings->setValue("CheckBoxes/quitWithLasProcess", false);
+ if(!settings->contains("CheckBoxes/text1"))
+ settings->setValue("Text/text1", QString());
+ if(!settings->contains("CheckBoxes/text2"))
+ settings->setValue("Text/text2", QString());
}
- atDateCheckBox->setChecked(settings.value("CheckBoxes/atDate").toBool());
- loggingCheckBox->setChecked(settings.value("CheckBoxes/logging").toBool());
- shutdownCheckBox->setChecked(settings.value("CheckBoxes/shutdown").toBool());
- quitCheckBox->setChecked(settings.value("CheckBoxes/quitWithLasProcess").toBool());
- textEdit->setText(settings.value("Text/text").toString());
+ atDateCheckBox->setChecked(settings->value("CheckBoxes/atDate").toBool());
+ loggingCheckBox->setChecked(settings->value("CheckBoxes/logging").toBool());
+ shutdownCheckBox->setChecked(settings->value("CheckBoxes/shutdown").toBool());
+ quitCheckBox->setChecked(settings->value("CheckBoxes/quitWithLasProcess").toBool());
+ textEdit->setText(settings->value("Text/text1").toString());
+ textEdit2->setText(settings->value("Text/text2").toString());
}
-
-
-#endif
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/gui.h shutdown-qapps-1.4.4/qprogram-starter/src/gui.h
--- shutdown-qapps-1.2.5/qprogram-starter/src/gui.h 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/gui.h 2010-08-30 01:51:18.000000000 +0200
@@ -31,24 +31,37 @@
void loadSettings();
private:
- QTimer *timer;
- QProcess *process;
- QProcess *process2;
- QDateTime timeInTheFuture;
+ QTimer *dateTimeTimer, *timer;
+ QProcess *process1, *process2;
+ QDateTime nextDate, timeInTheFuture;
double secondsToTimeInTheFuture;
- QPlainTextEdit *hintMsgBox;
+ QTextEdit *hintMsgBox;
+ QString file;
+ QSettings *settings;
+ QString program1, program2;
+ bool process2Started;
private slots:
+ void currentDateAndTime(); //for the current minimum date and time
void check(); //checks if the time that was set is reached
+ void getProgram1();
+ void getProgram2();
void run(); //runs the process
- void output(); //prints output into a file if loggingCheckBox is checked
- void errorOutput(); //prints errorOutput into a file if loggingCheckBox is checked
+ void output1(); //prints output into a file if loggingCheckBox is checked
+ void output2();
+ void errorOutput1(); //prints errorOutput into a file if loggingCheckBox is checked
+ void errorOutput2();
void message(); //shows a messageBox if the process is finished, or if errors occured
void checkForProcess2(); //if textEdit2 !=0 a second process will be started
void shutdown_or_message(); //either shuts down the system or shows if the process is finished
void info_hint(); //shows a InfoMessageBox
+ void saveData();
+
signals:
void finished();
+
+ protected:
+ virtual void closeEvent(QCloseEvent* window_close);
};
#endif
Binärdateien /tmp/6CsH81TGRV/shutdown-qapps-1.2.5/qprogram-starter/src/locale/de.qm and /tmp/P6qUUM9aas/shutdown-qapps-1.4.4/qprogram-starter/src/locale/de.qm sind verschieden.
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/locale/de.ts shutdown-qapps-1.4.4/qprogram-starter/src/locale/de.ts
--- shutdown-qapps-1.2.5/qprogram-starter/src/locale/de.ts 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/locale/de.ts 2010-09-04 00:18:21.000000000 +0200
@@ -4,85 +4,152 @@
<context>
<name>Gui</name>
<message>
- <location filename="../gui.cpp" line="50"/>
- <source>Hint</source>
- <translation>Hinweis</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="52"/>
- <source>The command in the second textbox (if there is any) will be executed after the first one. The message boxes will close themselves after 10 seconds.
-
-To start a program just type i.e. "firefox" or "firefox www.google.com" and then click on OK.
-
-If the process is "finished" while it is still running, then try the --nofork option (i.e. kopete --nofork). Note that this will also occure for some programs like gedit, firefox or gnome-terminal if they are already running.
-
-When you want to start a program or command with sudo, please use i.e. gksudo.
-
-make examples:
- make -C /path/to/project
- make clean -C /path/to/project
-
-If the shutdown won't work, it means that "sudo shutdown -P now" is used. This needs root permissions, so one needs to do the following:
-
-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.
-
-The configuration- and logging-files can be found at ~/.qprogram-starter/</source>
- <translation>Der Befehl in der zweiten Textbox (falls es einen gibt) wird nach dem ersten ausgeführt. Die Message Boxes werden sich nach 10 Sekunden selbst beenden.
-
-Um ein Programm zu starten, gib einfach z.B. "firefox" oder "firefox www.google.de" ein und klicke dann auf OK.
-
-Wenn der Prozess beendet ist, während er noch läuft, versuche die --nofork Option (z.B kopete --nofork). Beachte, dass dies auch bei einigen Programmen wie gedit, firefox oder gnome-terminal auftritt, wenn sie bereits laufen.
-
-Wenn man ein Programm oder ein Kommando mit sudo starten möchte, benutze bitte z.B. gksudo.
-
-make Beispiele:
- make -C /path/to/project
- make clean -C /path/to/project
-
-Falls der Shutdown nich funktioniert, bedeutet das, dass "sudo shutdown -P now" benutzt wird. Dies benötigt Root-Rechte, also muss man das folgende machen:
-
-Füge das Folgende in ein Terminal ein:
-"EDITOR:nano sudo -E visudo" und füge diese Zeile hinzu:
-"* ALL = NOPASSWD:/sbin/shutdown" wobei * den Benutzernamen oder %Gruppennamen ersetzt.
-
-Die Konfigurations- und Protokoll-Dateien kann man unter ~/.qprogram-starter/ finden</translation>
- </message>
- <message>
<location filename="../ui/gui.ui" line="14"/>
<source>qprogram-starter</source>
<translation>qprogram-starter</translation>
</message>
<message>
<location filename="../ui/gui.ui" line="34"/>
- <source>&logging?</source>
- <translation>&Protokollieren?</translation>
+ <source>HH:mm:ss</source>
+ <translation>HH:mm:ss</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="44"/>
+ <source>dddd dd.MM.yyyy</source>
+ <translation>dddd dd.MM.yyyy</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="71"/>
+ <source>&Hints</source>
+ <translation>&Hinweise</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="78"/>
+ <source>Quits qprogram-starter when the last command finished</source>
+ <translation>Beendet qprogram-starter wenn der letzte Befehl fertig ist</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="81"/>
+ <source>&Quit with last command</source>
+ <translation>Mit dem letzten &Befehl beenden</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="88"/>
+ <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Log <span style=" font-weight:600;">all</span> output</p></body></html></source>
+ <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Protokolliere <span style=" font-weight:600;">jede</span> Ausgabe</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="95"/>
+ <source>&Logging</source>
+ <translation>&Protokollieren</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="102"/>
+ <source>Shutdown the computer after all commands finished</source>
+ <translation>Schalte den Computer ab nachdem alle Befehle fertig sind</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="105"/>
+ <source>&Shutdown</source>
+ <translation>&Shutdown</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="149"/>
+ <source>The contents will be restored on every start of qprogram-starter</source>
+ <translation>Die Inhalte werden bei jedem Start von qprogram-starter wiederhergestellt</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="135"/>
+ <location filename="../ui/gui.ui" line="142"/>
+ <source>Browse...</source>
+ <translation>Durchsuchen...</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="152"/>
+ <source>Save text editors &contents</source>
+ <translation>Speichere &Inhalte der Texteditoren</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="125"/>
+ <source>Start the commands to this time and date</source>
+ <translation>Starte die Befehle zu diesem Termin</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="128"/>
+ <source>A&t date and time:</source>
+ <translation>&Zu Datum und Uhrzeit:</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="43"/>
+ <source>The command in the second text editor (if there is any) will be executed after the first one. The message boxes will close themselves after 10 seconds.<br/>To start a program just type i.e. "firefox" or "firefox www.google.com" and then click on OK.<br/><br/>If the process is "finished" although it is still running, then try the --nofork option (i.e. kopete --nofork). Note that this will also occure for some programs like gedit, firefox or gnome-terminal if they are already running.<br/><br/>When you want to start a program or command with sudo, please use i.e. gksudo.<br/><br/>make examples:<br/>&nbsp;make -C /path/to/project<br/>&nbsp;make clean -C /path/to/project<br/><br/>About Errors:<br/>Because almost every program gives a different error code, it is impossible to say what happend. So just log the output and see what kind of error occured. The output files can be found at <i>~/.qprogram-starter/</i>.<br/><br/>If the shutdown won't work, it means that "sudo shutdown -P now" is used. This needs root permissions. You can do the this:<br/><br/>Post the following in a terminal:<pre>EDITOR:nano sudo -E visudo</pre> and add this line:<pre>* ALL = NOPASSWD:/sbin/shutdown</pre> whereas * replaces the username or %groupname.<br/><br/>The configuration-file can be found at <i>~/.qprogram-starter/</i>.</source>
+ <translation>Der Befehl im zweiten Texteditor (falls es einen gibt) wird nach dem Ersten ausgeführt. Die Hinweisfenster werden sich nach 10 Sekunden selbst beenden.<br/>Um ein Programm zu starten, gib einfach z.B. "firefox" oder "firefox www.google.de" ein und klicke dann auf OK.<br/><br/>Wenn der Prozess "beendet" ist, obwohl er noch läuft, probiere die --nofork Option (z.B. kopete --nofork). Beachte, dass dies auch bei einigen Programmen wie gedit, firefox oder gnome-terminal auftritt, wenn sie bereits laufen.<br/><br/>Wenn man ein Programm oder ein Kommando mit sudo starten möchte, benutze bitte z.B. gksudo.<br/><br/>make Beispiele:<br/>&nbsp;make -C /path/to/project<br/>&nbsp;make clean -C /path/to/project<br/><br/>Über die Fehler:<br/>Weil fast jedes Programm unterschiedliche Fehlerkodes ausgeben, ist es unmöglich zu sagen was passiert ist. Protokolliere also einfach die Ausgaben und sieh was für eine Art Fehler aufgetreten ist. Die Ausgabedateien kann man unter <i>~/.qprogram-starter/</i> finden.<br/><br/>Falls der Shutdown nich funktioniert, bedeutet das, dass "sudo shutdown -P now" benutzt wird. Dies benötigt Root-Rechte. Dies kann man machen:<br/><br/>Füge das Folgende in ein Terminal ein:<pre>EDITOR:nano sudo -E visudo</pre>und füge diese Zeile hinzu:<pre>* ALL = NOPASSWD:/sbin/shutdown</pre>wobei * den Benutzernamen oder %Gruppennamen ersetzt.<br/><br/>Die Konfigurations-Datei kann man unter <i>~/.qprogram-starter/</i> finden.</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="96"/>
+ <location filename="../gui.cpp" line="101"/>
+ <source>Select a program</source>
+ <translation>Wähle ein Programm</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="123"/>
+ <source>The first text edit is empty!</source>
+ <translation>Der erste Texteditor ist leer!</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="230"/>
+ <location filename="../gui.cpp" line="236"/>
+ <source>Information</source>
+ <translation>Information</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="232"/>
+ <source><b>process 1 finished!</b></source>
+ <translation><b>Prozess 1 fertig!</br></translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="238"/>
+ <source><b>process 1 & 2 finished!</b></source>
+ <translation><b>Prozess 1 & 2 fertig!</b></translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="242"/>
+ <source>Error</source>
+ <translation>Fehler</translation>
</message>
<message>
- <location filename="../ui/gui.ui" line="76"/>
- <source>dddd dd.MM.yy HH:mm:ss</source>
- <translation>dddd dd.MM.yy HH:mm:ss</translation>
+ <location filename="../gui.cpp" line="245"/>
+ <source><b>Failed to start!</b><br/>No such program or command.</source>
+ <translation><b>Start fehlgeschlagen!</b><br/>Unbekannter Befehl oder unbekanntes Programm.</translation>
</message>
<message>
- <location filename="../ui/gui.ui" line="83"/>
- <source>&at date?</source>
- <translation>&zum Termin?</translation>
+ <location filename="../gui.cpp" line="253"/>
+ <location filename="../gui.cpp" line="262"/>
+ <source>: Failed to start! No such program or command.
+</source>
+ <translation>: Start fehlgeschlagen! Unbekannter Befehl oder unbekanntes Programm.</translation>
</message>
<message>
- <location filename="../ui/gui.ui" line="90"/>
- <source>&shutdown?</source>
- <translation>&shutdown?</translation>
+ <location filename="../gui.cpp" line="268"/>
+ <source><b>process 1 crashed!</b><br/>This could be caused by invalid parameters or options.</source>
+ <translation><b>Prozess 1 abgestürzt!</b><br/>Dies könnte durch unzulässige Parameter oder Optionen verursacht worden sein.</translation>
</message>
<message>
- <location filename="../ui/gui.ui" line="97"/>
- <source>&Hint</source>
- <translation>&Hinweis</translation>
+ <location filename="../gui.cpp" line="271"/>
+ <source><b>process 2 crashed!</b><br/>This could be caused by invalid parameters or options.</source>
+ <translation><b>Prozess 2 abgestürzt!</b><br/>Dies könnte durch unzulässige Parameter oder Optionen verursacht worden sein.</translation>
</message>
<message>
- <location filename="../ui/gui.ui" line="107"/>
- <source>quit with last &command?</source>
- <translation>mit dem letzten &Befehl beenden?</translation>
+ <location filename="../gui.cpp" line="274"/>
+ <source><b>Unknown error!</b><br/>This could be caused by invalid parameters or options.</source>
+ <translation><b>Unbekannter Fehler!</b><br/>Dies könnte durch unzulässige Parameter oder Optionen verursacht worden sein.</translation>
</message>
</context>
</TS>
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/main.cpp shutdown-qapps-1.4.4/qprogram-starter/src/main.cpp
--- shutdown-qapps-1.2.5/qprogram-starter/src/main.cpp 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/main.cpp 2010-09-04 01:00:34.000000000 +0200
@@ -20,7 +20,7 @@
int main (int argc, char *argv[]){
- QApplication app(argc,argv);
+ QApplication app(argc, argv);
//Qt translations
QTranslator qtTranslator;
qtTranslator.load("qt_" + QLocale::system().name(),
@@ -28,9 +28,8 @@
app.installTranslator(&qtTranslator);
//My translations
- QString lo = ":/locale/" + QLocale::system().name();
QTranslator translator;
- translator.load(lo);
+ translator.load(":/qprogram-starter/src/locale/" + QLocale::system().name());
app.installTranslator(&translator);
Gui window;
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/resource.qrc shutdown-qapps-1.4.4/qprogram-starter/src/resource.qrc
--- shutdown-qapps-1.2.5/qprogram-starter/src/resource.qrc 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/resource.qrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-<RCC>
- <qresource prefix="/" >
- <file>pixmap/qprogram-starter.xpm</file>
- <file>locale/de.qm</file>
- </qresource>
-</RCC>
diff -Nru shutdown-qapps-1.2.5/qprogram-starter/src/ui/gui.ui shutdown-qapps-1.4.4/qprogram-starter/src/ui/gui.ui
--- shutdown-qapps-1.2.5/qprogram-starter/src/ui/gui.ui 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qprogram-starter/src/ui/gui.ui 2010-09-04 01:06:29.000000000 +0200
@@ -6,19 +6,56 @@
<rect>
<x>0</x>
<y>0</y>
- <width>443</width>
- <height>301</height>
+ <width>466</width>
+ <height>432</height>
</rect>
</property>
<property name="windowTitle">
<string>qprogram-starter</string>
</property>
<property name="windowIcon">
- <iconset resource="../resource.qrc">
- <normaloff>:/pixmap/qprogram-starter.xpm</normaloff>:/pixmap/qprogram-starter.xpm</iconset>
+ <iconset resource="../../../qprogram-starter.qrc">
+ <normaloff>:/pix</normaloff>:/pix</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="5" column="1" colspan="3">
+ <item row="3" column="0" colspan="4">
+ <widget class="QTextEdit" name="textEdit2">
+ <property name="tabChangesFocus">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QTimeEdit" name="timeEdit">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="displayFormat">
+ <string>HH:mm:ss</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QDateEdit" name="dateEdit">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="displayFormat">
+ <string>dddd dd.MM.yyyy</string>
+ </property>
+ <property name="calendarPopup">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="4">
+ <widget class="QTextEdit" name="textEdit">
+ <property name="tabChangesFocus">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1" colspan="3">
<widget class="QDialogButtonBox" name="buttons">
<property name="locale">
<locale language="English" country="UnitedStates"/>
@@ -28,164 +65,192 @@
</property>
</widget>
</item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="loggingCheckBox">
+ <item row="8" column="0">
+ <widget class="QPushButton" name="hint">
<property name="text">
- <string>&logging?</string>
+ <string>&Hints</string>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="4">
- <widget class="QTextEdit" name="textEdit">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
+ <item row="5" column="1" colspan="2">
+ <widget class="QCheckBox" name="quitCheckBox">
+ <property name="toolTip">
+ <string>Quits qprogram-starter when the last command finished</string>
</property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
+ <property name="text">
+ <string>&Quit with last command</string>
</property>
- <property name="lineWidth">
- <number>1</number>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QCheckBox" name="loggingCheckBox">
+ <property name="toolTip">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Log <span style=" font-weight:600;">all</span> output</p></body></html></string>
</property>
- <property name="midLineWidth">
- <number>0</number>
+ <property name="text">
+ <string>&Logging</string>
</property>
</widget>
</item>
- <item row="0" column="1" colspan="2">
- <widget class="QDateTimeEdit" name="dateTimeEdit">
- <property name="enabled">
- <bool>false</bool>
+ <item row="5" column="3">
+ <widget class="QCheckBox" name="shutdownCheckBox">
+ <property name="toolTip">
+ <string>Shutdown the computer after all commands finished</string>
</property>
- <property name="date">
- <date>
- <year>2010</year>
- <month>1</month>
- <day>1</day>
- </date>
+ <property name="text">
+ <string>&Shutdown</string>
</property>
- <property name="currentSection">
- <enum>QDateTimeEdit::DaySection</enum>
+ </widget>
+ </item>
+ <item row="7" column="0" colspan="4">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="displayFormat">
- <string>dddd dd.MM.yy HH:mm:ss</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>25</height>
+ </size>
</property>
- </widget>
+ </spacer>
</item>
- <item row="0" column="0">
+ <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="atDateCheckBox">
+ <property name="toolTip">
+ <string>Start the commands to this time and date</string>
+ </property>
<property name="text">
- <string>&at date?</string>
+ <string>A&t date and time:</string>
</property>
</widget>
</item>
- <item row="4" column="3">
- <widget class="QCheckBox" name="shutdownCheckBox">
+ <item row="4" column="0" colspan="4">
+ <widget class="QPushButton" name="browse2">
<property name="text">
- <string>&shutdown?</string>
+ <string>Browse...</string>
</property>
</widget>
</item>
- <item row="5" column="0">
- <widget class="QPushButton" name="hint">
+ <item row="2" column="0" colspan="4">
+ <widget class="QPushButton" name="browse1">
<property name="text">
- <string>&Hint</string>
+ <string>Browse...</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="4">
- <widget class="QTextEdit" name="textEdit2"/>
- </item>
- <item row="4" column="1" colspan="2">
- <widget class="QCheckBox" name="quitCheckBox">
+ <item row="6" column="0" colspan="4">
+ <widget class="QPushButton" name="saveButton">
+ <property name="toolTip">
+ <string>The contents will be restored on every start of qprogram-starter</string>
+ </property>
<property name="text">
- <string>quit with last &command?</string>
+ <string>Save text editors &contents</string>
</property>
</widget>
</item>
</layout>
</widget>
<tabstops>
- <tabstop>loggingCheckBox</tabstop>
- <tabstop>quitCheckBox</tabstop>
- <tabstop>shutdownCheckBox</tabstop>
<tabstop>atDateCheckBox</tabstop>
- <tabstop>dateTimeEdit</tabstop>
+ <tabstop>dateEdit</tabstop>
+ <tabstop>timeEdit</tabstop>
+ <tabstop>browse1</tabstop>
<tabstop>textEdit</tabstop>
+ <tabstop>browse2</tabstop>
<tabstop>textEdit2</tabstop>
+ <tabstop>loggingCheckBox</tabstop>
+ <tabstop>quitCheckBox</tabstop>
+ <tabstop>shutdownCheckBox</tabstop>
+ <tabstop>saveButton</tabstop>
<tabstop>hint</tabstop>
<tabstop>buttons</tabstop>
</tabstops>
<resources>
- <include location="../resource.qrc"/>
+ <include location="../../../qprogram-starter.qrc"/>
</resources>
<connections>
<connection>
- <sender>buttons</sender>
- <signal>rejected()</signal>
- <receiver>Gui</receiver>
- <slot>close()</slot>
+ <sender>quitCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>shutdownCheckBox</receiver>
+ <slot>setDisabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>214</x>
+ <y>246</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>384</x>
+ <y>246</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>shutdownCheckBox</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>quitCheckBox</receiver>
+ <slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>254</x>
- <y>195</y>
+ <x>384</x>
+ <y>246</y>
</hint>
<hint type="destinationlabel">
- <x>199</x>
- <y>57</y>
+ <x>214</x>
+ <y>246</y>
</hint>
</hints>
</connection>
<connection>
<sender>atDateCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>dateTimeEdit</receiver>
+ <receiver>dateEdit</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>51</x>
+ <x>81</x>
<y>21</y>
</hint>
<hint type="destinationlabel">
- <x>245</x>
- <y>21</y>
+ <x>244</x>
+ <y>22</y>
</hint>
</hints>
</connection>
<connection>
- <sender>quitCheckBox</sender>
+ <sender>atDateCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>shutdownCheckBox</receiver>
- <slot>setDisabled(bool)</slot>
+ <receiver>timeEdit</receiver>
+ <slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>214</x>
- <y>246</y>
+ <x>81</x>
+ <y>21</y>
</hint>
<hint type="destinationlabel">
- <x>384</x>
- <y>246</y>
+ <x>385</x>
+ <y>22</y>
</hint>
</hints>
</connection>
<connection>
- <sender>shutdownCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>quitCheckBox</receiver>
- <slot>setDisabled(bool)</slot>
+ <sender>buttons</sender>
+ <signal>rejected()</signal>
+ <receiver>Gui</receiver>
+ <slot>close()</slot>
<hints>
<hint type="sourcelabel">
- <x>384</x>
- <y>246</y>
+ <x>272</x>
+ <y>279</y>
</hint>
<hint type="destinationlabel">
- <x>214</x>
- <y>246</y>
+ <x>227</x>
+ <y>150</y>
</hint>
</hints>
</connection>
diff -Nru shutdown-qapps-1.2.5/qprogram-starter.qrc shutdown-qapps-1.4.4/qprogram-starter.qrc
--- shutdown-qapps-1.2.5/qprogram-starter.qrc 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/qprogram-starter.qrc 2010-09-04 01:04:32.000000000 +0200
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/">
+ <file>qprogram-starter/src/locale/de.qm</file>
+ <file alias="pix">qprogram-starter/src/pixmap/qprogram-starter.xpm</file>
+ </qresource>
+</RCC>
diff -Nru shutdown-qapps-1.2.5/qshutdown/autostart/qshutdown.desktop shutdown-qapps-1.4.4/qshutdown/autostart/qshutdown.desktop
--- shutdown-qapps-1.2.5/qshutdown/autostart/qshutdown.desktop 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/autostart/qshutdown.desktop 2010-09-12 11:42:57.000000000 +0200
@@ -4,5 +4,5 @@
Exec=qshutdown
Terminal=false
Type=Application
-Icon=/usr/share/pixmaps/red_glasses.xpm
+Icon=red_glasses
Categories=Utility;
diff -Nru shutdown-qapps-1.2.5/qshutdown/NEWS shutdown-qapps-1.4.4/qshutdown/NEWS
--- shutdown-qapps-1.2.5/qshutdown/NEWS 2010-06-20 14:57:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/NEWS 2010-09-12 02:00:49.000000000 +0200
@@ -1,3 +1,54 @@
+Changes in Release 1.4.4
+=========================
+
+ - fixed: if no date was set and
+ the clock turned 12:00 AM
+ qshutdown stopped working because
+ the date was intern set to the current
+ day.
+ - .ui files had wrong .qrc path (fixed)
+
+Changes in Release 1.4.3
+=========================
+
+ - new version control
+ - and some minor changes
+
+Changes in Release 1.3.6
+=========================
+
+ - fix for timeEdit
+
+Changes in Release 1.3.4
+=========================
+
+ - fix for toolButton
+ - bugfix for spinBox
+
+Changes in Release 1.3.3
+=========================
+
+ - new layout for preferences
+
+Changes in Release 1.3.2
+=========================
+
+ - fixed and modified many things
+
+Changes in Release 1.3.1
+=========================
+
+ - adjusted some things in the calendar widget
+ - corrected quite a lot things
+ - made some code cleanups
+
+Changes in Release 1.3.0
+=========================
+
+ - new features: added a calendar and
+ the changes of the font settings
+ take immediantly effect in the main window
+
Changes in Release 1.2.5
=========================
diff -Nru shutdown-qapps-1.2.5/qshutdown/qshutdown.pro shutdown-qapps-1.4.4/qshutdown/qshutdown.pro
--- shutdown-qapps-1.2.5/qshutdown/qshutdown.pro 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/qshutdown.pro 2010-09-03 18:57:54.000000000 +0200
@@ -12,13 +12,14 @@
# Input
HEADERS = src/gui.h src/power.h src/info.h\
- src/preferences.h
+ src/preferences.h src/calendar.h
SOURCES = src/gui.cpp src/main.cpp\
src/power.cpp src/preferences.cpp\
- src/info.cpp
-RESOURCES = src/resource.qrc
+ src/info.cpp src/calendar.cpp
+RESOURCES = ../qshutdown.qrc
TRANSLATIONS = src/locale/de.ts
-FORMS = src/ui/gui.ui src/ui/preferences.ui
+FORMS = src/ui/gui.ui src/ui/preferences.ui\
+ src/ui/calendar.ui
!win32{
# install
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/calendar.cpp shutdown-qapps-1.4.4/qshutdown/src/calendar.cpp
--- shutdown-qapps-1.2.5/qshutdown/src/calendar.cpp 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/qshutdown/src/calendar.cpp 2010-08-22 16:52:31.000000000 +0200
@@ -0,0 +1,44 @@
+/* qshutdown, a program to shutdown/reboot/suspend/hibernate the system
+ * Copyright (C) 2009 2010 Christian Metscher <hakaishi@web.de>
+
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "calendar.h"
+
+extern bool timeRunning; //variable declared in gui.cpp
+QDate setCalendarDate;
+QDate calendarDate;
+
+Calendar::Calendar(QWidget *parent): QDialog(parent){
+ setupUi(this);
+
+ setWindowFlags(Qt::WindowStaysOnTopHint | Qt::Window); //always in front
+
+ calendarWidget->setMinimumDate(QDate::currentDate());
+
+ connect(calendarWidget, SIGNAL(clicked(QDate)), this, SLOT(getDate(QDate)));
+ connect(buttonBox, SIGNAL(accepted()), this, SLOT(setDate()));
+}
+
+Calendar::~Calendar(){;}
+
+void Calendar::getDate(QDate date){ calendarDate = date; }
+
+void Calendar::setDate(){
+ if(!calendarDate.isNull()){ //if a day was selected
+ setCalendarDate = calendarDate;
+ aDateWasSet();
+ }
+}
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/calendar.h shutdown-qapps-1.4.4/qshutdown/src/calendar.h
--- shutdown-qapps-1.2.5/qshutdown/src/calendar.h 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/qshutdown/src/calendar.h 2010-08-22 16:41:45.000000000 +0200
@@ -0,0 +1,39 @@
+/* qshutdown, a program to shutdown/reboot/suspend/hibernate the system
+ * Copyright (C) 2009 2010 Christian Metscher <hakaishi@web.de>
+
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef CALENDAR_H
+#define CALENDAR_H
+
+#include <QtGui>
+#include "ui_calendar.h"
+
+class Calendar : public QDialog, public Ui::Calendar {
+ Q_OBJECT
+
+ public:
+ Calendar(QWidget *parent = 0);
+ ~Calendar();
+
+ private slots:
+ void getDate(QDate date);
+ void setDate();
+
+ signals:
+ void aDateWasSet();
+
+};
+
+#endif //CALENDAR_H
Binärdateien /tmp/6CsH81TGRV/shutdown-qapps-1.2.5/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.qm and /tmp/P6qUUM9aas/shutdown-qapps-1.4.4/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.qm sind verschieden.
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.ts shutdown-qapps-1.4.4/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.ts
--- shutdown-qapps-1.2.5/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.ts 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/.fr-6usWx2/shutdown-qapps-1.2.3/qshutdown/src/locale/de.ts 1970-01-01 01:00:00.000000000 +0100
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de_DE" sourcelanguage="en_US">
-<context>
- <name>Gui</name>
- <message>
- <location filename="../gui.cpp" line="58"/>
- <source>R&eset Ctrl+E</source>
- <translation>R&eset Strg+E</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="59"/>
- <source>&Quit Ctrl+Q</source>
- <translation>Be&enden Strg+Q</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="60"/>
- <source>&Info Ctrl+I</source>
- <translation>&Info Strg+I</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="61"/>
- <source>&Logfile Ctrl+L</source>
- <translation>Protoko&lldatei Strg+L</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="63"/>
- <source>&Preferences Ctrl+P</source>
- <translation>&Einstellungen Strg+P</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="66"/>
- <source>&Shutdown Ctrl+S</source>
- <translation>&Shutdown Strg+S</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="68"/>
- <source>&Reboot Ctrl+R</source>
- <translation>Neusta&rt Strg+R</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="70"/>
- <source>S&uspend Ctrl+U</source>
- <translation>S&tandby Strg+U</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="72"/>
- <source>&Hibernate Ctrl+H</source>
- <translation>Ru&hezustand Strg+H</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="96"/>
- <source>&Minimize!</source>
- <translation>&Minimieren!</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="176"/>
- <location filename="../gui.cpp" line="526"/>
- <location filename="../ui/gui.ui" line="117"/>
- <source>Shutdown-time:</source>
- <translation>Shutdown-Zeitpunkt:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="177"/>
- <location filename="../gui.cpp" line="527"/>
- <location filename="../ui/gui.ui" line="69"/>
- <source>Minutes till shutdown:</source>
- <translation>Minuten zum Shutdown:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="180"/>
- <location filename="../gui.cpp" line="531"/>
- <source>Reboot-time:</source>
- <translation>Neustart-Zeitpunkt:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="181"/>
- <location filename="../gui.cpp" line="532"/>
- <source>Minutes till reboot:</source>
- <translation>Minuten zum Neustart:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="184"/>
- <location filename="../gui.cpp" line="536"/>
- <source>Suspend-time:</source>
- <translation>Standby-Zeitpunkt:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="185"/>
- <location filename="../gui.cpp" line="537"/>
- <source>Minutes till suspend:</source>
- <translation>Minuten zum Standby:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="188"/>
- <location filename="../gui.cpp" line="541"/>
- <source>Hibernate-time:</source>
- <translation>Ruhezustand-Zeitpunkt:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="189"/>
- <location filename="../gui.cpp" line="542"/>
- <source>Minutes till hibernate:</source>
- <translation>Minuten zum Ruhezustand:</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="269"/>
- <source>shutdown in </source>
- <translation>Shutdown in </translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="271"/>
- <source>reboot in </source>
- <translation>Neustart in </translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="273"/>
- <source>suspend in </source>
- <translation>Standby in </translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="275"/>
- <source>hibernate in </source>
- <translation>Ruhezustand in </translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="278"/>
- <source> hours + </source>
- <translation> Stunden + </translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="279"/>
- <location filename="../gui.cpp" line="281"/>
- <source> minutes</source>
- <translation> Minuten</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="283"/>
- <source> seconds</source>
- <translation> Sekunden</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="287"/>
- <location filename="../ui/gui.ui" line="280"/>
- <source>minutes</source>
- <translation>Minuten</translation>
- </message>
- <message>
- <location filename="../gui.cpp" line="291"/>
- <source>seconds</source>
- <translation>Sekunden</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="20"/>
- <source>'qshutdown'</source>
- <translation>'qshutdown'</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="172"/>
- <source>Shutdown</source>
- <translation>Shutdown</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="177"/>
- <source>Reboot</source>
- <translation>Neustart</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="182"/>
- <source>Suspend</source>
- <translation>Standby</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="187"/>
- <source>Hibernate</source>
- <translation>Ruhezustand</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="206"/>
- <source>&lock after start?</source>
- <translation>Nach dem Start &sperren?</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="225"/>
- <source>&warnings on?</source>
- <translation>&Warnungen an?</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="300"/>
- <source>&OK</source>
- <translation>&OK</translation>
- </message>
- <message>
- <location filename="../ui/gui.ui" line="373"/>
- <source>&now!</source>
- <translation>&Jetzt!</translation>
- </message>
-</context>
-<context>
- <name>Preferences</name>
- <message>
- <location filename="../ui/preferences.ui" line="14"/>
- <source>Preferences</source>
- <translation>Einstellungen</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="34"/>
- <source>Set minutes to countdown</source>
- <translation>Setze Minuten für Countdown</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="44"/>
- <source>Set a target time</source>
- <translation>Setze Ziel-Zeit</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="73"/>
- <source>Enable the &target time at startup</source>
- <translation>Aktiviere &Ziel-Zeit bei Programmstart</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="86"/>
- <source>Enable &countdown at startup</source>
- <translation>Aktiviere &Countdown bei Programmstart</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="96"/>
- <source>Set if the checkbox for "&lock after start?" is
-checked at startup</source>
- <translation>Setze ob die Checkbox für "Nach dem Start
-&sperren?" bei Programmstart gesetzt sein soll</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="107"/>
- <source>Set if the checkbox for "&warnings on?" is
-checked at startup</source>
- <translation>Setze ob die Checkbox für "&Warnungen an?"
-bei Programmstart gesetzt sein soll</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="118"/>
- <source>Set if start time and the minutes of how long qshutdown
-was running shall be l&ogged</source>
- <translation>Setze ob die Startzeit und wie lange qshutdown
-gelaufen ist, &gespeichert werden soll</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="136"/>
- <source>Shutdown</source>
- <translation>Shutdown</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="141"/>
- <source>Reboot</source>
- <translation>Neustart</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="146"/>
- <source>Suspend</source>
- <translation>Standby</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="151"/>
- <source>Hibernate</source>
- <translation>Ruhezustand</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="159"/>
- <source>Set what should be shown first at startup </source>
- <translation>Setze was beim Programmstart
-zuerst angezeigt werden soll</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="203"/>
- <source>Font 1 (e.g. labels)</source>
- <translation>Schriftgröße 1
-(z.B. Beschriftungen)</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="210"/>
- <source>Font 2 (OK/Minimize button)</source>
- <translation>Schriftgröße 2
-(OK/Minimieren Knöpfe)</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="217"/>
- <source>Font 3 (checkboxes and "now!" button)</source>
- <translation>Schriftgröße 3
-(Checkboxen und "Jetzt!" Knopf)</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="224"/>
- <source>&Reset settings</source>
- <translation>&Einstellungen zurücksetzen</translation>
- </message>
- <message>
- <location filename="../ui/preferences.ui" line="231"/>
- <source>Size for log file in KB</source>
- <translation>Größe der Protokolldatei in KB</translation>
- </message>
- <message>
- <location filename="../preferences.cpp" line="42"/>
- <source>The File "</source>
- <translation>Die Datei "</translation>
- </message>
- <message>
- <location filename="../preferences.cpp" line="42"/>
- <source>" is not writeable!
-Maybe you just don't have the permissions to do so.</source>
- <translation>" ist nicht beschreibbar!
-Vielleicht haben Sie dazu einfach keine Rechte.</translation>
- </message>
-</context>
-<context>
- <name>QObject</name>
- <message>
- <location filename="../main.cpp" line="39"/>
- <source>qshutdown will show it self 3 times as a warning if there are less than 70 seconds left.
-
-This program uses qdbus to send a shutdown/reboot/suspend/hibernate request to either the gnome- or kde-session-manager, to HAL or to DeviceKit and if none of these works, the command 'sudo shutdown' will be used (note that when sending the request to HAL or DeviceKit, or the shutdown command is used, the Session will never be saved. If the shutdown command is used, the program will only be able to shutdown and reboot). So if nothing happens when the shutdown- or reboot-time is reached, it means that one lacks the rights for the shutdown command. In this case one can do the following:
-
-Paste the following in a terminal:
-"EDITOR:nano sudo -E visudo" and add this line:
-"* ALL = NOPASSWD:/sbin/shutdown" whereas * replaces the username or %groupname.
-
-The maximum Number of countdown_minutes is 1440 (24 hours).
-The configurationfile (and logfile) is located at ~/.qshutdown (under Linux/Unix).
-
-For admins:
-With the option Lock_all in qshutdown.conf set to true the user won't be able to change any settings. If you change the permissions of qshutdown.conf with "sudo chown root -R ~/.qshutdown" and "sudo chmod 744 ~/.qshutdown/qshutdown.conf", the user won't be able to change anything in the configurationfile too.</source>
- <translation>qshutdown wird sich selbst 3 mal als Warnung zeigen, falls weniger als 70 Sekunden übrig sind.
-
-Dieses Programm benutzt qdbus um eine Shutdown/Neustart/Standby/Ruhezustand Anforderung an den Gnome- oder KDE-Session-Manager, zu HAL oder zu DeviceKit zu senden und wenn nichts davon funktioniert, wird der Befehl 'sudo shutdown' benutzt (merke, dass die Sitzung niemals gespeichert werden kann, wenn die Anforderung an HAL oder DeviceKit gesendet, oder der shutdown Befehl benutzt wird. Falls der shutdown Befehl benutzt wird, kann das Programm nur den Shutdown und Neutstart ausführen). Wenn also beim Erreichen des Shutdown- oder Neustart-Zeitpunkts nichts passiert, liegt das daran, dass einem die Rechte für den shutdown Befehl fehlen. In diesem Fall kann man das Folgende machen:
-
-Füge das Folgende in ein Terminal ein:
-"EDITOR:nano sudo -E visudo" und füge diese Zeile hinzu:
-"* ALL = NOPASSWD:/sbin/shutdown" wobei * den Benuternamen oder %Gruppennamen ersetzt.
-
-Die maximale Zahl für den Minuten-Countdown ist 1440 (24 Stunden).
-Die Konfigurationsdatei (und Logfile) befindet sich im Verzeichnis ~/.qshutdown (unter Linux/Unix).
-
-Für Administratoren:
-Durch das auf true Setzen der Option Lock_all in der qshutdown.conf, wird der Benutzer keine Einstellungen verändern können. Falls Sie die Zugriffsrechte der qshutdown.conf mit "sudo chown root -R ~/.qshutdown" und "sudo chmod 744 ~/qshutdown/qshutdown.conf" ändern, wird der Benutzer auch keine Änderungen an der Konfigurationsdatei machen können.</translation>
- </message>
-</context>
-</TS>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/gui.ui shutdown-qapps-1.4.4/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/gui.ui
--- shutdown-qapps-1.2.5/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/gui.ui 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/gui.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Gui</class>
- <widget class="QWidget" name="Gui">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>405</width>
- <height>335</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle">
- <string>'qshutdown'</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../resource.qrc">
- <normaloff>:/pixmap/red_glasses.xpm</normaloff>:/pixmap/red_glasses.xpm</iconset>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <property name="leftMargin">
- <number>55</number>
- </property>
- <property name="topMargin">
- <number>15</number>
- </property>
- <property name="rightMargin">
- <number>55</number>
- </property>
- <property name="bottomMargin">
- <number>20</number>
- </property>
- <property name="verticalSpacing">
- <number>15</number>
- </property>
- <item row="0" column="0">
- <widget class="QFrame" name="frame">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape">
- <enum>QFrame::Box</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="lineWidth">
- <number>1</number>
- </property>
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="2" column="0">
- <widget class="QLabel" name="minutes">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Minutes till shutdown:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QTimeEdit" name="timeEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QSpinBox" name="spin">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>1440</number>
- </property>
- <property name="singleStep">
- <number>1</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="targetTime">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Shutdown-time:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QRadioButton" name="radio1">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QRadioButton" name="radio2">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="layoutDirection">
- <enum>Qt::RightToLeft</enum>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QComboBox" name="comboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
- </property>
- <item>
- <property name="text">
- <string>Shutdown</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Reboot</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Suspend</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Hibernate</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0">
- <layout class="QGridLayout" name="gridLayout3">
- <item row="0" column="0">
- <widget class="QCheckBox" name="lock">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&lock after start?</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="warnings">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- <property name="text">
- <string>&warnings on?</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="2" column="0">
- <layout class="QGridLayout" name="gridLayout4">
- <property name="horizontalSpacing">
- <number>15</number>
- </property>
- <item row="0" column="0">
- <spacer name="horizontalSpacer1">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>45</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
- <spacer name="horizontalSpacer2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="lcdL">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>30</height>
- </size>
- </property>
- <property name="text">
- <string>minutes</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item row="3" column="0">
- <layout class="QGridLayout" name="gridLayout5" columnstretch="0,0,0">
- <property name="horizontalSpacing">
- <number>15</number>
- </property>
- <item row="0" column="1" rowspan="3">
- <widget class="QPushButton" name="ok">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>&OK</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- <property name="default">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <spacer name="horizontalSpacer5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>85</width>
- <height>13</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0">
- <spacer name="horizontalSpacer4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>85</width>
- <height>13</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0">
- <spacer name="horizontalSpacer3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>85</width>
- <height>13</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="now">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>1</width>
- <height>1</height>
- </size>
- </property>
- <property name="text">
- <string>&now!</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>ok</tabstop>
- <tabstop>lock</tabstop>
- <tabstop>warnings</tabstop>
- <tabstop>comboBox</tabstop>
- <tabstop>radio1</tabstop>
- <tabstop>radio2</tabstop>
- <tabstop>timeEdit</tabstop>
- <tabstop>spin</tabstop>
- <tabstop>now</tabstop>
- </tabstops>
- <resources>
- <include location="../resource.qrc"/>
- </resources>
- <connections>
- <connection>
- <sender>timeEdit</sender>
- <signal>editingFinished()</signal>
- <receiver>ok</receiver>
- <slot>setFocus()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>289</x>
- <y>37</y>
- </hint>
- <hint type="destinationlabel">
- <x>190</x>
- <y>240</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>spin</sender>
- <signal>editingFinished()</signal>
- <receiver>ok</receiver>
- <slot>setFocus()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>289</x>
- <y>70</y>
- </hint>
- <hint type="destinationlabel">
- <x>190</x>
- <y>240</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>radio1</sender>
- <signal>toggled(bool)</signal>
- <receiver>timeEdit</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>238</x>
- <y>57</y>
- </hint>
- <hint type="destinationlabel">
- <x>294</x>
- <y>57</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>radio2</sender>
- <signal>toggled(bool)</signal>
- <receiver>spin</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>238</x>
- <y>80</y>
- </hint>
- <hint type="destinationlabel">
- <x>294</x>
- <y>80</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/preferences.ui shutdown-qapps-1.4.4/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/preferences.ui
--- shutdown-qapps-1.2.5/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/preferences.ui 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/.fr-DSGVDK/shutdown-qapps-1.2.3/qshutdown/src/ui/preferences.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Preferences</class>
- <widget class="QDialog" name="Preferences">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>442</width>
- <height>560</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Preferences</string>
- </property>
- <property name="windowIcon">
- <iconset resource="../resource.qrc">
- <normaloff>:/pixmap/red_glasses.xpm</normaloff>:/pixmap/red_glasses.xpm</iconset>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="15" column="1" colspan="2">
- <widget class="QDialogButtonBox" name="buttonBox">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="spinLabel">
- <property name="text">
- <string>Set minutes to countdown</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="timeLabel">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set a target time</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QTimeEdit" name="timeEdit"/>
- </item>
- <item row="2" column="0">
- <widget class="QSpinBox" name="spin">
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>1440</number>
- </property>
- <property name="singleStep">
- <number>1</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="2">
- <widget class="QRadioButton" name="radio1">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Enable the &target time at startup</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="8" column="0" colspan="2">
- <widget class="QRadioButton" name="radio2">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Enable &countdown at startup</string>
- </property>
- </widget>
- </item>
- <item row="10" column="0" colspan="2">
- <widget class="QCheckBox" name="lock">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set if the checkbox for "&lock after start?" is
-checked at startup</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0" colspan="2">
- <widget class="QCheckBox" name="warn">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set if the checkbox for "&warnings on?" is
-checked at startup</string>
- </property>
- </widget>
- </item>
- <item row="12" column="0" colspan="2">
- <widget class="QCheckBox" name="log">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set if start time and the minutes of how long qshutdown
-was running shall be l&ogged</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QComboBox" name="comboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
- </property>
- <item>
- <property name="text">
- <string>Shutdown</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Reboot</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Suspend</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Hibernate</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="comboLabel">
- <property name="text">
- <string>Set what should be shown first at startup </string>
- </property>
- </widget>
- </item>
- <item row="14" column="1">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0">
- <widget class="QSpinBox" name="font1Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QSpinBox" name="font2Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QSpinBox" name="font3Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- <property name="value">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="font1Label">
- <property name="text">
- <string>Font 1 (e.g. labels)</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="font2Label">
- <property name="text">
- <string>Font 2 (OK/Minimize button)</string>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLabel" name="font3Label">
- <property name="text">
- <string>Font 3 (checkboxes and "now!" button)</string>
- </property>
- </widget>
- </item>
- <item row="14" column="0">
- <widget class="QPushButton" name="reset">
- <property name="text">
- <string>&Reset settings</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Size for log file in KB</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QDoubleSpinBox" name="spinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <tabstops>
- <tabstop>comboBox</tabstop>
- <tabstop>timeEdit</tabstop>
- <tabstop>spin</tabstop>
- <tabstop>font1Spin</tabstop>
- <tabstop>font2Spin</tabstop>
- <tabstop>font3Spin</tabstop>
- <tabstop>radio1</tabstop>
- <tabstop>radio2</tabstop>
- <tabstop>lock</tabstop>
- <tabstop>warn</tabstop>
- <tabstop>log</tabstop>
- <tabstop>reset</tabstop>
- <tabstop>buttonBox</tabstop>
- </tabstops>
- <resources>
- <include location="../resource.qrc"/>
- </resources>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>accepted()</signal>
- <receiver>Preferences</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
- </hint>
- <hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>Preferences</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
- </hint>
- <hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>log</sender>
- <signal>toggled(bool)</signal>
- <receiver>spinBox</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>206</x>
- <y>411</y>
- </hint>
- <hint type="destinationlabel">
- <x>68</x>
- <y>223</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/.fr-nsibqR/shutdown-qapps-1.2.3/qshutdown/src/pixmap/red_glasses.xpm shutdown-qapps-1.4.4/qshutdown/src/.fr-nsibqR/shutdown-qapps-1.2.3/qshutdown/src/pixmap/red_glasses.xpm
--- shutdown-qapps-1.2.5/qshutdown/src/.fr-nsibqR/shutdown-qapps-1.2.3/qshutdown/src/pixmap/red_glasses.xpm 2010-06-18 17:51:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/.fr-nsibqR/shutdown-qapps-1.2.3/qshutdown/src/pixmap/red_glasses.xpm 1970-01-01 01:00:00.000000000 +0100
@@ -1,578 +0,0 @@
-/* XPM */
-static char * red_glasses_xpm[] = {
-"32 32 543 2",
-" c None",
-". c #C7A404",
-"+ c #C7A509",
-"@ c #C7A508",
-"# c #C6A202",
-"$ c #C7A507",
-"% c #C6A304",
-"& c #C7A407",
-"* c #D1B32C",
-"= c #EBDA86",
-"- c #F7EFBC",
-"; c #FBF5CB",
-"> c #FDF9D7",
-", c #FDF8D2",
-"' c #FAF2BB",
-") c #F5EAA2",
-"! c #E8D36B",
-"~ c #D0B120",
-"{ c #D7BD43",
-"] c #F9F3CB",
-"^ c #FEFBE4",
-"/ c #FEF9CD",
-"( c #FEF8CA",
-"_ c #FEFAD3",
-": c #FEF9D5",
-"< c #FEF9D6",
-"[ c #FEF9CA",
-"} c #FDF6B9",
-"| c #FDF4AA",
-"1 c #FEF6B7",
-"2 c #F5E893",
-"3 c #D3B62A",
-"4 c #C8A60B",
-"5 c #F3E9B2",
-"6 c #FFFDED",
-"7 c #FEF9D3",
-"8 c #FFFCE9",
-"9 c #FFFFFF",
-"0 c #FFFFFD",
-"a c #FFFEF8",
-"b c #FFFDF2",
-"c c #FDF6B8",
-"d c #FDF091",
-"e c #FDF4AB",
-"f c #ECDA6C",
-"g c #C8A404",
-"h c #CBAA18",
-"i c #FBF6D9",
-"j c #FEFBE2",
-"k c #FFFCEA",
-"l c #FFFEFA",
-"m c #FFFEF5",
-"n c #FFFDF0",
-"o c #FFFBE3",
-"p c #FEFADC",
-"q c #FEF7BF",
-"r c #FCED77",
-"s c #FDF192",
-"t c #F4E582",
-"u c #C9A60B",
-"v c #C7A50B",
-"w c #FAF6D6",
-"x c #FEFADD",
-"y c #FFFEF7",
-"z c #FFFEF4",
-"A c #FFFCEB",
-"B c #FEFCE6",
-"C c #FEFBDF",
-"D c #FEFAD7",
-"E c #FEF9CE",
-"F c #FEF8C4",
-"G c #FDF4A4",
-"H c #FCEA63",
-"I c #FDEF83",
-"J c #F3E47B",
-"K c #2E3436",
-"L c #AA9018",
-"M c #F4ECB7",
-"N c #FDFADD",
-"O c #FFFEF6",
-"P c #FFFDF4",
-"Q c #FFFDF1",
-"R c #FFFDEE",
-"S c #FEFCEA",
-"T c #FEFCE4",
-"U c #FEFBDE",
-"V c #FEFAD6",
-"W c #FEF8CD",
-"X c #FEF7C3",
-"Y c #FDF6B7",
-"Z c #FDF29C",
-"` c #FCEE76",
-" . c #FCE957",
-".. c #FCEE84",
-"+. c #E9D65B",
-"@. c #B3991A",
-"#. c #464B4C",
-"$. c #2F3536",
-"%. c #353C3C",
-"&. c #8D938E",
-"*. c #BBB587",
-"=. c #D6BD46",
-"-. c #FFFCE6",
-";. c #FEFAE1",
-">. c #FFFDF3",
-",. c #FFFDEF",
-"'. c #FEFBE0",
-"). c #FEFAD8",
-"!. c #FEF8CF",
-"~. c #FEF7C4",
-"{. c #FEF6B8",
-"]. c #FEF4AA",
-"^. c #FDF39C",
-"/. c #FDF08D",
-"(. c #FCEE77",
-"_. c #FCEA5A",
-":. c #FBE95D",
-"<. c #F8E977",
-"[. c #CDB122",
-"}. c #C2BC8D",
-"|. c #A6ABA6",
-"1. c #383E3E",
-"2. c #69504E",
-"3. c #A17C77",
-"4. c #763232",
-"5. c #8E342B",
-"6. c #B3867C",
-"7. c #93877D",
-"8. c #A4A399",
-"9. c #9F9A90",
-"0. c #A49C92",
-"a. c #AAA99F",
-"b. c #AAA9A0",
-"c. c #B6B6AC",
-"d. c #BDBDB2",
-"e. c #5B5F5E",
-"f. c #592B2C",
-"g. c #582A2A",
-"h. c #52564F",
-"i. c #BCB990",
-"j. c #B6AF7D",
-"k. c #A9A269",
-"l. c #A8A15F",
-"m. c #A89F53",
-"n. c #9D9343",
-"o. c #857B31",
-"p. c #876027",
-"q. c #9A502B",
-"r. c #B94F4F",
-"s. c #876F70",
-"t. c #BBA5A0",
-"u. c #585D5C",
-"v. c #613B3B",
-"w. c #825655",
-"x. c #A64948",
-"y. c #9B3131",
-"z. c #A83434",
-"A. c #722C2D",
-"B. c #80292A",
-"C. c #7D2728",
-"D. c #6B1F20",
-"E. c #752221",
-"F. c #712829",
-"G. c #953F3E",
-"H. c #6A2A2B",
-"I. c #CED1CE",
-"J. c #CEC5BF",
-"K. c #C6BEB6",
-"L. c #782A2B",
-"M. c #AA3434",
-"N. c #951919",
-"O. c #791616",
-"P. c #8C1111",
-"Q. c #731717",
-"R. c #781615",
-"S. c #7C1515",
-"T. c #AA3838",
-"U. c #A53E3E",
-"V. c #882828",
-"W. c #7B2121",
-"X. c #B44E4E",
-"Y. c #B63E3E",
-"Z. c #A12D2D",
-"`. c #982525",
-" + c #891E1E",
-".+ c #881818",
-"++ c #801919",
-"@+ c #851616",
-"#+ c #801D1D",
-"$+ c #771A1B",
-"%+ c #6C1C1C",
-"&+ c #7B807E",
-"*+ c #5F2526",
-"=+ c #9F6F6D",
-"-+ c #B44041",
-";+ c #B13B3C",
-">+ c #9D2B2C",
-",+ c #891718",
-"'+ c #8A1010",
-")+ c #8A1111",
-"!+ c #7E1212",
-"~+ c #952222",
-"{+ c #922727",
-"]+ c #6B2120",
-"^+ c #621816",
-"/+ c #9D3130",
-"(+ c #912A2A",
-"_+ c #932020",
-":+ c #921E1E",
-"<+ c #901919",
-"[+ c #8E1414",
-"}+ c #891111",
-"|+ c #891010",
-"1+ c #871010",
-"2+ c #791516",
-"3+ c #6D1717",
-"4+ c #D1CEB0",
-"5+ c #D1CCA6",
-"6+ c #892424",
-"7+ c #AC3A39",
-"8+ c #B23F3E",
-"9+ c #9F2C2C",
-"0+ c #932322",
-"a+ c #8E1716",
-"b+ c #871212",
-"c+ c #871111",
-"d+ c #861010",
-"e+ c #841010",
-"f+ c #8C1515",
-"g+ c #8F2121",
-"h+ c #881A19",
-"i+ c #B59503",
-"j+ c #752726",
-"k+ c #7A2525",
-"l+ c #992929",
-"m+ c #8B1B1B",
-"n+ c #8E1B1B",
-"o+ c #8D1616",
-"p+ c #8C1414",
-"q+ c #861212",
-"r+ c #7F1010",
-"s+ c #781C1B",
-"t+ c #712120",
-"u+ c #7A1816",
-"v+ c #FEF9CF",
-"w+ c #FDF7C3",
-"x+ c #722722",
-"y+ c #9B2C2A",
-"z+ c #922825",
-"A+ c #912222",
-"B+ c #851C18",
-"C+ c #871615",
-"D+ c #851010",
-"E+ c #801010",
-"F+ c #741010",
-"G+ c #9B2222",
-"H+ c #9E3030",
-"I+ c #482D04",
-"J+ c #AF856F",
-"K+ c #9A724C",
-"L+ c #912525",
-"M+ c #822A2A",
-"N+ c #881B1B",
-"O+ c #7F1919",
-"P+ c #771615",
-"Q+ c #841111",
-"R+ c #712320",
-"S+ c #7C332E",
-"T+ c #813430",
-"U+ c #B0967E",
-"V+ c #FEF8C8",
-"W+ c #FDF6BD",
-"X+ c #B3A67A",
-"Y+ c #921B1B",
-"Z+ c #86211D",
-"`+ c #7F291F",
-" @ c #841B16",
-".@ c #811111",
-"+@ c #7C100F",
-"@@ c #811A18",
-"#@ c #B49500",
-"$@ c #C5A103",
-"%@ c #F6F1CB",
-"&@ c #D6CD80",
-"*@ c #704D3B",
-"=@ c #A06E50",
-"-@ c #6A231C",
-";@ c #7C1614",
-">@ c #8B3429",
-",@ c #70231D",
-"'@ c #9E8970",
-")@ c #B8AF8D",
-"!@ c #E6E1B4",
-"~@ c #F9F3C3",
-"{@ c #FDF7BF",
-"]@ c #FDF5B6",
-"^@ c #F8EFA8",
-"/@ c #CBAB72",
-"(@ c #BDA163",
-"_@ c #90643E",
-":@ c #8A3121",
-"<@ c #882616",
-"[@ c #5B0E0B",
-"}@ c #70150F",
-"|@ c #925C1A",
-"1@ c #9A581B",
-"2@ c #B0A22F",
-"3@ c #E4D15B",
-"4@ c #C4A100",
-"5@ c #C8A407",
-"6@ c #FAF2BC",
-"7@ c #FCF198",
-"8@ c #F0E58E",
-"9@ c #E2D992",
-"0@ c #DFD796",
-"a@ c #CCAE7F",
-"b@ c #DDD7A3",
-"c@ c #E0DBA9",
-"d@ c #E9E4B3",
-"e@ c #F6F0BC",
-"f@ c #FDF7C0",
-"g@ c #FDF6BC",
-"h@ c #FDF5B5",
-"i@ c #FDF4AD",
-"j@ c #FDF3A4",
-"k@ c #FDF299",
-"l@ c #F7EB89",
-"m@ c #EADE79",
-"n@ c #DFD36A",
-"o@ c #DCCE5F",
-"p@ c #DBCD54",
-"q@ c #DECE4B",
-"r@ c #E8D538",
-"s@ c #EBD72B",
-"t@ c #F0DB29",
-"u@ c #F1E26F",
-"v@ c #C6A300",
-"w@ c #C9A609",
-"x@ c #F5EAA5",
-"y@ c #FDF29A",
-"z@ c #FDF08E",
-"A@ c #F9EC8C",
-"B@ c #D3B72B",
-"C@ c #FBF1A3",
-"D@ c #FDF4AE",
-"E@ c #FDF5B3",
-"F@ c #FDF5B4",
-"G@ c #FDF5AF",
-"H@ c #FDF3A3",
-"I@ c #FDF29B",
-"J@ c #FDF191",
-"K@ c #FCF088",
-"L@ c #FCEE7D",
-"M@ c #FCED72",
-"N@ c #FCEC67",
-"O@ c #FAE859",
-"P@ c #D3B416",
-"Q@ c #F8E33B",
-"R@ c #F4DE26",
-"S@ c #F2DE32",
-"T@ c #EDDB5D",
-"U@ c #C8A500",
-"V@ c #C5A104",
-"W@ c #E8D46E",
-"X@ c #FDF4A9",
-"Y@ c #FCEF86",
-"Z@ c #CFAF1C",
-"`@ c #EFDF79",
-" # c #FDF3A2",
-".# c #FDF4A7",
-"+# c #FDF39F",
-"@# c #FDF298",
-"## c #FCEF7F",
-"$# c #FCED75",
-"%# c #FCEC6B",
-"&# c #FCEB60",
-"*# c #EFD844",
-"=# c #CEAE10",
-"-# c #F6E133",
-";# c #F2DB1D",
-"># c #F3E24E",
-",# c #E1C93A",
-"'# c #C5A100",
-")# c #CFB021",
-"!# c #FEF6BA",
-"~# c #FCEF84",
-"{# c #EEDB6B",
-"]# c #C9A70D",
-"^# c #DCC343",
-"/# c #EAD666",
-"(# c #F2E27F",
-"_# c #F5E787",
-":# c #F8EB8D",
-"<# c #FAEE8F",
-"[# c #FDF193",
-"}# c #F9EB7F",
-"|# c #F7E874",
-"1# c #F4E266",
-"2# c #F2DE58",
-"3# c #E9D243",
-"4# c #DCC12D",
-"5# c #C9A70A",
-"6# c #EBD549",
-"7# c #F4DE2A",
-"8# c #F0D913",
-"9# c #F5E76F",
-"0# c #CCAD12",
-"a# c #C6A307",
-"b# c #F6EA94",
-"c# c #FDF08C",
-"d# c #FCEE79",
-"e# c #FCF085",
-"f# c #F6E88D",
-"g# c #E3CF60",
-"h# c #D8BD3E",
-"i# c #CFB023",
-"j# c #CCAC19",
-"k# c #C9A710",
-"l# c #C7A50A",
-"m# c #C4A000",
-"n# c #CCAC18",
-"o# c #CFB022",
-"p# c #D8BD3D",
-"q# c #E3CE5A",
-"r# c #F4E571",
-"s# c #F6E23E",
-"t# c #F2DB1A",
-"u# c #F1DC30",
-"v# c #EEDC57",
-"w# c #C6A200",
-"x# c #D4B528",
-"y# c #FCEC71",
-"z# c #FCED74",
-"A# c #FCEE7A",
-"B# c #FCEF88",
-"C# c #FDF5B0",
-"D# c #FEF9D0",
-"E# c #FEFADB",
-"F# c #FEFCE7",
-"G# c #FDF4A8",
-"H# c #FDF086",
-"I# c #FAE85A",
-"J# c #F6E132",
-"K# c #F3DC20",
-"L# c #EFD812",
-"M# c #F5E66C",
-"N# c #D1B114",
-"O# c #C4A206",
-"P# c #ECDB6F",
-"Q# c #FDF297",
-"R# c #FCEC6A",
-"S# c #FCEC6D",
-"T# c #FCED71",
-"U# c #FCED6F",
-"V# c #FCEB65",
-"W# c #FCEB5F",
-"X# c #FCEA58",
-"Y# c #FCE951",
-"Z# c #F9E542",
-"`# c #F3DD22",
-" $ c #F0D812",
-".$ c #F3E255",
-"+$ c #E6D145",
-"@$ c #C3A000",
-"#$ c #C6A306",
-"$$ c #FDF08B",
-"%$ c #FCEB62",
-"&$ c #FCEC68",
-"*$ c #FCEC69",
-"=$ c #FCEA5E",
-"-$ c #FCE953",
-";$ c #FBE84C",
-">$ c #F9E43F",
-",$ c #F6E131",
-"'$ c #F0D813",
-")$ c #F2E049",
-"!$ c #EEDC5C",
-"~$ c #C9A50C",
-"{$ c #F4E686",
-"]$ c #FDF190",
-"^$ c #FCEB5D",
-"/$ c #FCEA5C",
-"($ c #FCEA5B",
-"_$ c #FCEA59",
-":$ c #FCE956",
-"<$ c #FCE952",
-"[$ c #F9E543",
-"}$ c #F7E238",
-"|$ c #F5DF2C",
-"1$ c #F2DC1E",
-"2$ c #F0D917",
-"3$ c #F3E35A",
-"4$ c #EEDC60",
-"5$ c #C8A408",
-"6$ c #C5A204",
-"7$ c #EAD866",
-"8$ c #FCF29B",
-"9$ c #FCED70",
-"0$ c #FBE84F",
-"a$ c #FBE84E",
-"b$ c #FBE84D",
-"c$ c #FBE74A",
-"d$ c #FAE645",
-"e$ c #F7E237",
-"f$ c #F5E02E",
-"g$ c #F3DD24",
-"h$ c #F1DA1A",
-"i$ c #F2DF3D",
-"j$ c #F5E874",
-"k$ c #E5D14A",
-"l$ c #C5A202",
-"m$ c #C19F02",
-"n$ c #D0B221",
-"o$ c #F2E278",
-"p$ c #FBEF90",
-"q$ c #F9EA70",
-"r$ c #F8E652",
-"s$ c #F7E343",
-"t$ c #F5E133",
-"u$ c #F4DF2E",
-"v$ c #F4E032",
-"w$ c #F3DF39",
-"x$ c #F4E354",
-"y$ c #EEDB60",
-"z$ c #CEB11B",
-"A$ c #C09D00",
-"B$ c #C3A101",
-"C$ c #CDAC16",
-"D$ c #E3CB47",
-"E$ c #EFDF6D",
-"F$ c #F4E57B",
-"G$ c #F7EB87",
-"H$ c #F6EA84",
-"I$ c #F2E373",
-"J$ c #EDDC60",
-"K$ c #E0C83C",
-"L$ c #CCAB13",
-"M$ c #C2A000",
-"N$ c #B19200",
-"O$ c #C09F01",
-"P$ c #C3A100",
-"Q$ c #C5A000",
-"R$ c #C09F00",
-" ",
-" . + @ # # $ $ % ",
-" & * = - ; > , ' ) ! ~ . ",
-" & { ] ^ / ( _ : < [ } | 1 2 3 . ",
-" 4 5 6 7 8 9 9 9 9 0 a b 8 c d e f g ",
-" h i j k 9 9 9 0 l m n k o p 7 q r s t u ",
-" v w x y 9 0 l y z n A B C D E F } G H I J . ",
-" K K L M N z l y O P Q R S T U V W X Y e Z ` ...+.@.#.$. ",
-" %.&.*.=.-.;.>.b Q Q n ,.A -.'.).!.~.{.].^./.(._.:.<.[.}.|.1. ",
-" 2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u. ",
-" v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.|.L.M.N.O.P.Q.R.S.P.T.U.V.K ",
-" W.X.Y.Z.`. +.+++@+#+$+%+&+*+*+=+-+;+>+,+P.'+)+)+!+~+{+]+ ",
-" ^+/+(+_+:+<+[+}+|+1+2+3+P.4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+ ",
-" i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+q+D+E+F+G+H+I+ ",
-" i+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@e+}+b+p+@@#@ ",
-" $@%@&@*@=@-@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@ ",
-" 5@6@7@8@9@0@a@b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@ ",
-" w@x@y@z@A@B@C@D@E@h@]@F@G@| H@I@J@K@L@M@N@O@P@Q@R@S@T@U@ ",
-" V@W@X@Y@z@Z@`@ #.#X@X@.#j@+#@#J@K@##$#%#&#*#=#-#;#>#,#'# ",
-" )#!#L@~#{#]#^#/#(#_#:#<#[#/.}#|#1#2#3#4#5#6#7#8#9#0# ",
-" a#b#c#d#e#f#g#h#i#j#k#l#m#m#l#k#n#o#p#q#r#s#t#u#v#w# ",
-" x#| y#z#A#B#^.C#f@D#E#k n F#E#X G#H#I#J#K#L#M#N# ",
-" O#P#Q#R#S#T#z#$#$#z#M@U#%#V#W#X#Y#Z#-#`# $.$+$@$ ",
-" #$_#$$%$V#N@&$*$N@V#%$=$_.-$;$>$,$`#'$)$!$# ",
-" ~${$]$^$_./$/$($_$:$<$;$[$}$|$1$2$3$4$5$ ",
-" 6$7$8$9$0$a$b$c$d$>$e$f$g$h$i$j$k$l$ ",
-" m$n$o$p$q$r$s$t$u$v$w$x$j$y$z$A$ ",
-" B$C$D$E$F$G$H$I$J$K$L$M$ ",
-" N$O$P$Q$Q$P$R$N$ ",
-" ",
-" ",
-" "};
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/gui.cpp shutdown-qapps-1.4.4/qshutdown/src/gui.cpp
--- shutdown-qapps-1.2.5/qshutdown/src/gui.cpp 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/gui.cpp 2010-09-13 22:51:31.000000000 +0200
@@ -19,8 +19,14 @@
#include "power.h"
#include "preferences.h"
#include "info.h"
+#include "calendar.h"
bool timeRunning;
+extern QString fonts; //variable declared in preferences.cpp
+extern int fontS1; // ""
+extern int fontS2; // ""
+extern int fontS3; // ""
+extern QDate setCalendarDate; //variable declared in calendar.cpp
Gui::Gui(QWidget *parent): QWidget(parent){
@@ -38,6 +44,9 @@
//Preferences
pref = new Preferences(this);
+ //CalendarBox
+ calendarBox = new Calendar(this);
+
//InfoMessageBox
infoBox = new Info(this);
@@ -47,8 +56,15 @@
horizontalSpacer4->changeSize(85,13,QSizePolicy::Maximum,QSizePolicy::Expanding);
horizontalSpacer5->changeSize(85,13,QSizePolicy::Maximum,QSizePolicy::Expanding);
+ //Versioning
+ QFile versionFile(":version");
+ versionFile.open(QIODevice::ReadOnly | QIODevice::Text);
+ QTextStream in(&versionFile);
+ QString string = in.readLine();
+ version->setText(string);
+
//TrayIcon
- icon = QIcon(":/pixmap/red_glasses.xpm");
+ icon = QIcon(":red_glasses");
TIcon = new QSystemTrayIcon(this);
TIcon->setIcon(icon);
TIcon->show();
@@ -106,15 +122,15 @@
//Fonts
font1 = new QFont;
- font1->setFamily(QString::fromUtf8("Times"));
+ font1->setFamily("Times New Roman");
font1->setBold(true);
font2 = new QFont;
- font2->setFamily(QString::fromUtf8("Times"));
+ font2->setFamily("Times New Roman");
font2->setBold(true);
font3 = new QFont;
- font3->setFamily(QString::fromUtf8("Times"));
+ font3->setFamily("Times New Roman");
//Timer
timer = new QTimer(this); //for updating countdown display and check if time is over
@@ -128,7 +144,7 @@
connect(power_actions, SIGNAL(triggered(QAction*)), this, SLOT(power(QAction*)));
connect(ti, SIGNAL(timeout()), this, SLOT(showW())); //set window state for ti
connect(ok, SIGNAL(clicked(bool)), this, SLOT(starter())); //starts timer & stopps ti
- connect(timer, SIGNAL(timeout()), this, SLOT(update())); //runs update() every 10 seconds
+ connect(timer, SIGNAL(timeout()), this, SLOT(updateT())); //runs updateT() every 10 seconds
connect(now, SIGNAL(clicked(bool)), this, SLOT(finished())); //closes the program & starts the shutdown immediately
connect(minim, SIGNAL(clicked(bool)), this, SLOT(showMinimized())); //minimizes window
connect(TIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
@@ -136,11 +152,14 @@
connect(pref_action, SIGNAL(triggered()), pref, SLOT(show()));
connect(pref, SIGNAL(starting()), ti, SLOT(stop()));
connect(pref, SIGNAL(finishing()), ti, SLOT(start())); //start the Qtimer ti if timeRunning == false
+ connect(pref, SIGNAL(changeFont()), this, SLOT(getFonts()));
connect(reset_action, SIGNAL(triggered()), this, SLOT(reset()));
connect(info_action, SIGNAL(triggered()), this, SLOT(setInfoText()));
connect(info_action, SIGNAL(triggered()), infoBox, SLOT(show()));
connect(infoBox, SIGNAL(starting()), ti, SLOT(stop()));
connect(infoBox, SIGNAL(finishing()), ti, SLOT(start()));
+ connect(toolButton, SIGNAL(clicked(bool)), this, SLOT(showCalendarBox()));
+ connect(calendarBox, SIGNAL(aDateWasSet()), this, SLOT(setDate()));
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(beforeQuit())); //save window size / logs and unregister qshutdown
connect(quit_action, SIGNAL(triggered()), qApp, SLOT(quit())); //contextmenu "Quit" for the systray quits Programm
}
@@ -149,6 +168,8 @@
void Gui::setInfoText(){ infoBox->setPlainText(informations); }
+void Gui::setDate(){ toolButton->setText(setCalendarDate.toString(Qt::SystemLocaleShortDate)); }
+
void Gui::center(){
QDesktopWidget *desktop = qApp->desktop();
QPoint pos((desktop->width() - frameGeometry().width()) / 2,
@@ -158,10 +179,8 @@
void Gui::iconActivated(QSystemTrayIcon::ActivationReason reason){
if(reason == QSystemTrayIcon::Trigger){
- if(isHidden()||isMinimized()){ //in case thant the window is minimized or hidden
- center();
+ if(isHidden()||isMinimized()) //in case thant the window is minimized or hidden
showNormal();
- }
else
hide();
}
@@ -256,53 +275,127 @@
}
}
-void Gui::update(){
+void Gui::updateT(){
if(finishedExecuted)
reset();
- Time(); //calculates i or rather the new time every second
- if(warnings->isChecked() && (((i<=100) && (i>95)) || ((i<=40) && (i>35))) && !ti->isActive())
- ti->start(30000);
-
- QString tip1, tip2, tip3;
+ QString tip1, tip2;
- tip1 = ("'qshutdown' - ");
if(shutdown_action->isChecked())
- tip2 = (tr("shutdown in "));
+ tip1 = (tr("shutdown in "));
if(reboot_action->isChecked())
- tip2 = (tr("reboot in "));
+ tip1 = (tr("reboot in "));
if(suspend_action->isChecked())
- tip2 = (tr("suspend in "));
+ tip1 = (tr("suspend in "));
if(hibernate_action->isChecked())
- tip2 = (tr("hibernate in "));
+ tip1 = (tr("hibernate in "));
+
+ if(QDate::currentDate().daysTo(setCalendarDate) >= 1)
+ toolButton->setText(setCalendarDate.toString(Qt::SystemLocaleShortDate));
+
+ if(QDate::currentDate().daysTo(setCalendarDate) > 1){ //if the date difference between today and the selected day
+ //in the calendar is greater than one
+ //if more than one year
+ if(QDate::currentDate().daysTo(setCalendarDate) >= 365*2){
+ tip2 = (QString::number(QDate::currentDate().daysTo(setCalendarDate)/365) + " " + tr("years"));
+ lcdL->setText(tr("years"));
+ lcd->display(QDate::currentDate().daysTo(setCalendarDate)/365);
+ }
+ if(QDate::currentDate().daysTo(setCalendarDate) >= 365 && QDate::currentDate().daysTo(setCalendarDate) < 365*2){
+ tip2 = (">= 1 " + tr("year"));
+ lcdL->setText(tr("year"));
+ lcd->display(1);
+ }
+ //if more than one month
+ if(QDate::currentDate().daysTo(setCalendarDate) >= 30*2 && QDate::currentDate().daysTo(setCalendarDate) < 356){
+ tip2 = (QString::number(QDate::currentDate().daysTo(setCalendarDate)/30) + " " + tr("months"));
+ lcdL->setText(tr("months"));
+ lcd->display(QDate::currentDate().daysTo(setCalendarDate)/30);
+ }
+ if(QDate::currentDate().daysTo(setCalendarDate) >= 30 && QDate::currentDate().daysTo(setCalendarDate) < 30*2){
+ tip2 = (">= 1 " + tr("month"));
+ lcdL->setText(tr("month"));
+ lcd->display(1);
+ }
+ //if less than 30 days
+ if(QDate::currentDate().daysTo(setCalendarDate) < 30){
+ tip2 = (QString::number(QDate::currentDate().daysTo(setCalendarDate)) + " " + tr("days"));
+ lcdL->setText(tr("days"));
+ lcd->display(QDate::currentDate().daysTo(setCalendarDate));
+ }
+ }
+ if(QDate::currentDate().daysTo(setCalendarDate) == 1){ //if there is one more day to go
+
+ Time();
+
+ if(i>=86400){ //if one day and some time to go
+ tip2 = (">= 1 " + tr("day"));
+ lcdL->setText(tr("day"));
+ lcd->display(1);
+ }
+ if(i<86400 && i>=3600*2){ //if there is less than one day show hours
+ tip2 = (QString::number(i/3600) + " " + tr("hours"));
+ lcdL->setText(tr("hours"));
+ lcd->display(i/3600);
+ }
+ if(i<3600*2 && i>=3600){
+ tip2 = ("1 " + tr("hour"));
+ lcdL->setText(tr("hour"));
+ lcd->display(1);
+ }
+ if(i<3600 && i>=60*2){ //if less than one hour
+ tip2 = (QString::number(i/60) + " " + tr("minutes"));
+ lcdL->setText(tr("minutes"));
+ lcd->display(i/60);
+ }
+ if(i<60){
+ tip2 = ("1 " + tr("minute"));
+ lcdL->setText(tr("minute"));
+ lcd->display(1);
+ }
+ }
+ if(QDate::currentDate()==setCalendarDate || setCalendarDate.isNull()){ //if there was no date
+ //set in the calendar or the set day is the current day
+ Time();
+
+ if(warnings->isChecked() && (((i<=100) && (i>95)) || ((i<=40) && (i>35))) && !ti->isActive())
+ ti->start(30000);
+
+ if(i >= 3600){ //Display hours and minutes
+ tip2 = (QString::number(i/3600) + " " + tr("hours") + " + "
+ + QString::number(i/60 - (i/3600)*60) + " " + tr("minutes"));
+ lcdL->setText(tr("hours"));
+ lcd->display(i/3600);
+ }
+ if(i<3600 && i>=60*2){ //Display only minutes
+ tip2 = (QString::number(i/60) + " " + tr("minutes"));
+ lcdL->setText(tr("minutes"));
+ lcd->display(i/60);
+ }
+ if(i<60*2 && i>=60){
+ tip2 = ("1 " + tr("minute"));
+ lcdL->setText(tr("minute"));
+ lcd->display(1);
+ }
+ if(i<60){ //Display only seconds
+ tip2 = (QString::number(i) + " " + tr("seconds"));
+ lcdL->setText(tr("seconds"));
+ lcd->display(i);
+ }
- if((i/60.0)>=60) //Display hours and minutes
- tip3 = (QString::number(i/3600) + tr(" hours + ")
- + QString::number(i/60 - (i/3600)*60) + tr(" minutes"));
- else if(((i/60.0)<60) && (i>=60)) //Display only minutes
- tip3 = (QString::number(i/60) + tr(" minutes"));
- else if(i<60) //Display only seconds
- tip3 = (QString::number(i) + tr(" seconds"));
- setWindowTitle(tip1 + tip2 + tip3);
- TIcon->setToolTip(tip2 + tip3);
- if(i>=60){
- lcdL->setText(tr("minutes"));
- lcd->display(i/60);
- }
- else if(i<60){
- lcdL->setText(tr("seconds"));
- lcd->display(i);
- }
-
- //this will ensure that the shutdown-type will be executed in case a few seconds were skipped
- if(i<=86390)
- n = 10; //any number to keep i in check
- if((i==0) || ((i>n) && (i>86390)))
- finished(); //execute shutdown-type
+ //this will ensure that the shutdown-type will be executed in case a few seconds were skipped
+ if(i<=86390)
+ n = 10; //any number to keep i in check
+ if((i==0) || ((i>n) && (i>86390)))
+ finished(); //execute shutdown-type
+ }
+ setWindowTitle(tip1 + tip2);
+ TIcon->setToolTip(tip1 + tip2);
}
void Gui::set(){
timeRunning = true;
+
localTime = QTime::currentTime(); //the time now
if(radio2->isChecked()) //if minute-countdown
futureTime = localTime.addSecs(spin->value()*60); //add spinbox-value to the current time
@@ -310,9 +403,6 @@
futureTime = timeEdit->time(); //else the future time is the time of the timeEdit
n = 86400; // any number bigger than i - just for initializing
- if(lockAll)
- warnings->setEnabled(true);
-
if(lock->isChecked()){ //when OK-button is clicked and lock is checked
spin->setDisabled(true); //deaktivate spinbox
radio1->setDisabled(true); //deaktivate radiobutton
@@ -338,8 +428,13 @@
void Gui::Time(){
localTime = QTime::currentTime();
i = localTime.secsTo(futureTime); //the difference of the localTime and the future time
+ if(radio2->isChecked() && (QDate::currentDate().daysTo(setCalendarDate) == 1))
+ i = ((23-localTime.hour())*3600 + (59-localTime.minute())*60 + spin->value()*60);
+ if(radio1->isChecked() && (QDate::currentDate().daysTo(setCalendarDate) == 1))
+ i = ((23-localTime.hour())*3600 + (59-localTime.minute())*60 + timeEdit->time().hour()*3600
+ + timeEdit->time().minute()*60);
if(i<0) //if the date is on the next day
- i = 86400 + localTime.secsTo(futureTime); //add 1 day in seconds
+ i += 86400; //add 1 day in seconds
}
void Gui::saveWindowSize(){
@@ -350,7 +445,7 @@
QString file(QDir::homePath() + "/.qshutdown/qshutdown.conf");
QSettings settings(file, QSettings::NativeFormat);
#endif //Q_OS_WIN32
- settings.setValue("WindowSize/size", size());
+ settings.setValue("MainWindowSize/size", size());
}
void Gui::finished(){
@@ -425,13 +520,6 @@
#endif //Q_OS_WIN32
}
-void Gui::resizeEvent(QResizeEvent* window_resize){
- #ifndef Q_OS_WIN32
- center();
- #endif //Q_OS_WIN32
- QWidget::resizeEvent(window_resize);
-}
-
void Gui::loadSettings(){
/***************** create file and it's entries *****************/
#ifdef Q_OS_WIN32
@@ -454,8 +542,10 @@
settings.setValue("Time/countdown_minutes", 60);
if(!settings.contains("Time/countdown_at_startup"))
settings.setValue("Time/countdown_at_startup", false);
- if(!settings.contains("WindowSize/size"))
- settings.setValue("WindowSize/size", QSize(430, 325));
+ if(!settings.contains("MainWindowSize/size"))
+ settings.setValue("MainWindowSize/size", QSize(430, 325));
+ if(!settings.contains("Fonts/font_type"))
+ settings.setValue("Fonts/font_type", "Times New Roman");
if(!settings.contains("Fonts/font1"))
settings.setValue("Fonts/font1", 13);
if(!settings.contains("Fonts/font2"))
@@ -480,7 +570,10 @@
/***************** read files entries *****************/
timeEdit->setTime(QTime(settings.value("Time/time_hour").toInt(),settings.value("Time/time_minute").toInt()));
spin->setValue(settings.value("Time/countdown_minutes").toInt());
- resize(settings.value("WindowSize/size").toSize());
+ resize(settings.value("MainWindowSize/size").toSize());
+ font1->setFamily(settings.value("Fonts/font_type").toString());
+ font2->setFamily(settings.value("Fonts/font_type").toString());
+ font3->setFamily(settings.value("Fonts/font_type").toString());
font1->setPointSize(settings.value("Fonts/font1").toInt());
font2->setPointSize(settings.value("Fonts/font2").toInt());
font3->setPointSize(settings.value("Fonts/font3").toInt());
@@ -505,10 +598,10 @@
comboBox->setDisabled(true);
targetTime->setDisabled(true);
minutes->setDisabled(true);
+ toolButton->setDisabled(true);
quit_action->setDisabled(true);
log_action->setDisabled(true);
power_actions->setDisabled(true);
- warnings->setDisabled(true);
}
else
lockAll = false;
@@ -557,8 +650,11 @@
void Gui::reset(){
setWindowTitle("'qshutdown'");
+ toolButton->setText("...");
lcd->display(0);
TIcon->setToolTip(NULL);
+ lcdL->setText(tr("minutes"));
+ setCalendarDate = QDate();
if(finishedExecuted)
showNormal();
timer->stop();
@@ -580,7 +676,43 @@
comboBox->setEnabled(true);
targetTime->setEnabled(true);
minutes->setEnabled(true);
+ toolButton->setEnabled(true);
power_actions->setEnabled(true);
}
else loadSettings();
}
+
+void Gui::getFonts(){
+ font1->setFamily(fonts);
+ font1->setPointSize(fontS1);
+ font2->setFamily(fonts);
+ font2->setPointSize(fontS2);
+ font3->setFamily(fonts);
+ font3->setPointSize(fontS3);
+
+ comboBox->setFont(*font1);
+ targetTime->setFont(*font1);
+ minutes->setFont(*font1);
+ spin->setFont(*font1);
+ timeEdit->setFont(*font1);
+ lcdL->setFont(*font1);
+ ok->setFont(*font2);
+ minim->setFont(*font2);
+ warnings->setFont(*font3);
+ lock->setFont(*font3);
+ now->setFont(*font3);
+
+ resize(minimumSize());
+}
+
+void Gui::showCalendarBox(){
+ if(setCalendarDate.isNull())
+ calendarBox->calendarWidget->setSelectedDate(QDate::currentDate());
+ else
+ calendarBox->calendarWidget->setSelectedDate(setCalendarDate);
+ if(timeRunning && lock->isChecked())
+ calendarBox->calendarWidget->blockSignals(true);
+ else
+ calendarBox->calendarWidget->blockSignals(false);
+ calendarBox->show();
+}
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/gui.h shutdown-qapps-1.4.4/qshutdown/src/gui.h
--- shutdown-qapps-1.2.5/qshutdown/src/gui.h 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/gui.h 2010-08-22 16:46:11.000000000 +0200
@@ -29,6 +29,7 @@
class Preferences;
class Info;
+class Calendar;
class Gui : public QWidget, public Ui::Gui {
Q_OBJECT // important for creating own singals and slots
@@ -72,6 +73,7 @@
double logFileSize;
Preferences *pref;
Info *infoBox;
+ Calendar *calendarBox;
// defining signals and slots
@@ -80,7 +82,7 @@
void showW();
void starter();
void set();
- void update();
+ void updateT();
void Time();
void power_action(int action);
void power(QAction *action);
@@ -89,12 +91,14 @@
void finished();
void beforeQuit();
void setInfoText();
+ void getFonts();
+ void showCalendarBox();
+ void setDate();
public slots:
Q_SCRIPTABLE void showRunningProgram();
protected:
void keyPressEvent(QKeyEvent *kEvent);
virtual void closeEvent(QCloseEvent* window_close);
- virtual void resizeEvent(QResizeEvent* window_resize);
};
#endif //GUI_H
Binärdateien /tmp/6CsH81TGRV/shutdown-qapps-1.2.5/qshutdown/src/locale/de.qm and /tmp/P6qUUM9aas/shutdown-qapps-1.4.4/qshutdown/src/locale/de.qm sind verschieden.
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/locale/de.ts shutdown-qapps-1.4.4/qshutdown/src/locale/de.ts
--- shutdown-qapps-1.2.5/qshutdown/src/locale/de.ts 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/locale/de.ts 2010-09-04 00:17:05.000000000 +0200
@@ -2,151 +2,207 @@
<!DOCTYPE TS>
<TS version="2.0" language="de_DE" sourcelanguage="en_US">
<context>
+ <name>Calendar</name>
+ <message>
+ <location filename="../ui/calendar.ui" line="14"/>
+ <source>Calendar</source>
+ <translation>Kalender</translation>
+ </message>
+</context>
+<context>
<name>Gui</name>
<message>
- <location filename="../gui.cpp" line="58"/>
+ <location filename="../gui.cpp" line="75"/>
<source>R&eset Ctrl+E</source>
<translation>R&eset Strg+E</translation>
</message>
<message>
- <location filename="../gui.cpp" line="59"/>
+ <location filename="../gui.cpp" line="76"/>
<source>&Quit Ctrl+Q</source>
<translation>Be&enden Strg+Q</translation>
</message>
<message>
- <location filename="../gui.cpp" line="60"/>
+ <location filename="../gui.cpp" line="77"/>
<source>&Info Ctrl+I</source>
<translation>&Info Strg+I</translation>
</message>
<message>
- <location filename="../gui.cpp" line="61"/>
+ <location filename="../gui.cpp" line="78"/>
<source>&Logfile Ctrl+L</source>
<translation>Protoko&lldatei Strg+L</translation>
</message>
<message>
- <location filename="../gui.cpp" line="63"/>
+ <location filename="../gui.cpp" line="80"/>
<source>&Preferences Ctrl+P</source>
<translation>&Einstellungen Strg+P</translation>
</message>
<message>
- <location filename="../gui.cpp" line="66"/>
+ <location filename="../gui.cpp" line="83"/>
<source>&Shutdown Ctrl+S</source>
<translation>&Shutdown Strg+S</translation>
</message>
<message>
- <location filename="../gui.cpp" line="68"/>
+ <location filename="../gui.cpp" line="85"/>
<source>&Reboot Ctrl+R</source>
<translation>Neusta&rt Strg+R</translation>
</message>
<message>
- <location filename="../gui.cpp" line="70"/>
+ <location filename="../gui.cpp" line="87"/>
<source>S&uspend Ctrl+U</source>
<translation>S&tandby Strg+U</translation>
</message>
<message>
- <location filename="../gui.cpp" line="72"/>
+ <location filename="../gui.cpp" line="89"/>
<source>&Hibernate Ctrl+H</source>
<translation>Ru&hezustand Strg+H</translation>
</message>
<message>
- <location filename="../gui.cpp" line="96"/>
+ <location filename="../gui.cpp" line="113"/>
<source>&Minimize!</source>
<translation>&Minimieren!</translation>
</message>
<message>
- <location filename="../gui.cpp" line="175"/>
- <location filename="../gui.cpp" line="527"/>
<location filename="../ui/gui.ui" line="117"/>
+ <location filename="../gui.cpp" line="195"/>
+ <location filename="../gui.cpp" line="626"/>
<source>Shutdown-time:</source>
<translation>Shutdown-Zeitpunkt:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="176"/>
- <location filename="../gui.cpp" line="528"/>
<location filename="../ui/gui.ui" line="69"/>
+ <location filename="../gui.cpp" line="196"/>
+ <location filename="../gui.cpp" line="627"/>
<source>Minutes till shutdown:</source>
<translation>Minuten zum Shutdown:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="179"/>
- <location filename="../gui.cpp" line="532"/>
+ <location filename="../gui.cpp" line="199"/>
+ <location filename="../gui.cpp" line="631"/>
<source>Reboot-time:</source>
<translation>Neustart-Zeitpunkt:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="180"/>
- <location filename="../gui.cpp" line="533"/>
+ <location filename="../gui.cpp" line="200"/>
+ <location filename="../gui.cpp" line="632"/>
<source>Minutes till reboot:</source>
<translation>Minuten zum Neustart:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="183"/>
- <location filename="../gui.cpp" line="537"/>
+ <location filename="../gui.cpp" line="203"/>
+ <location filename="../gui.cpp" line="636"/>
<source>Suspend-time:</source>
<translation>Standby-Zeitpunkt:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="184"/>
- <location filename="../gui.cpp" line="538"/>
+ <location filename="../gui.cpp" line="204"/>
+ <location filename="../gui.cpp" line="637"/>
<source>Minutes till suspend:</source>
<translation>Minuten zum Standby:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="187"/>
- <location filename="../gui.cpp" line="542"/>
+ <location filename="../gui.cpp" line="207"/>
+ <location filename="../gui.cpp" line="641"/>
<source>Hibernate-time:</source>
<translation>Ruhezustand-Zeitpunkt:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="188"/>
- <location filename="../gui.cpp" line="543"/>
+ <location filename="../gui.cpp" line="208"/>
+ <location filename="../gui.cpp" line="642"/>
<source>Minutes till hibernate:</source>
<translation>Minuten zum Ruhezustand:</translation>
</message>
<message>
- <location filename="../gui.cpp" line="268"/>
+ <location filename="../gui.cpp" line="286"/>
<source>shutdown in </source>
<translation>Shutdown in </translation>
</message>
<message>
- <location filename="../gui.cpp" line="270"/>
+ <location filename="../gui.cpp" line="288"/>
<source>reboot in </source>
<translation>Neustart in </translation>
</message>
<message>
- <location filename="../gui.cpp" line="272"/>
+ <location filename="../gui.cpp" line="290"/>
<source>suspend in </source>
<translation>Standby in </translation>
</message>
<message>
- <location filename="../gui.cpp" line="274"/>
+ <location filename="../gui.cpp" line="292"/>
<source>hibernate in </source>
<translation>Ruhezustand in </translation>
</message>
<message>
- <location filename="../gui.cpp" line="277"/>
- <source> hours + </source>
- <translation> Stunden + </translation>
+ <location filename="../gui.cpp" line="301"/>
+ <location filename="../gui.cpp" line="302"/>
+ <source>years</source>
+ <translation>Jahren</translation>
</message>
<message>
- <location filename="../gui.cpp" line="278"/>
- <location filename="../gui.cpp" line="280"/>
- <source> minutes</source>
- <translation> Minuten</translation>
+ <location filename="../gui.cpp" line="306"/>
+ <location filename="../gui.cpp" line="307"/>
+ <source>year</source>
+ <translation>Jahr</translation>
</message>
<message>
- <location filename="../gui.cpp" line="282"/>
- <source> seconds</source>
- <translation> Sekunden</translation>
+ <location filename="../gui.cpp" line="312"/>
+ <location filename="../gui.cpp" line="313"/>
+ <source>months</source>
+ <translation>Monaten</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="317"/>
+ <location filename="../gui.cpp" line="318"/>
+ <source>month</source>
+ <translation>Monat</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="337"/>
+ <location filename="../gui.cpp" line="338"/>
+ <location filename="../gui.cpp" line="365"/>
+ <location filename="../gui.cpp" line="367"/>
+ <source>hours</source>
+ <translation>Stunden</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="342"/>
+ <location filename="../gui.cpp" line="343"/>
+ <source>hour</source>
+ <translation>Stunde</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="352"/>
+ <location filename="../gui.cpp" line="353"/>
+ <location filename="../gui.cpp" line="376"/>
+ <location filename="../gui.cpp" line="377"/>
+ <source>minute</source>
+ <translation>Minute</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="323"/>
+ <location filename="../gui.cpp" line="324"/>
+ <source>days</source>
+ <translation>Tagen</translation>
+ </message>
+ <message>
+ <location filename="../gui.cpp" line="332"/>
+ <location filename="../gui.cpp" line="333"/>
+ <source>day</source>
+ <translation>Tag</translation>
</message>
<message>
- <location filename="../gui.cpp" line="286"/>
<location filename="../ui/gui.ui" line="280"/>
+ <location filename="../gui.cpp" line="347"/>
+ <location filename="../gui.cpp" line="348"/>
+ <location filename="../gui.cpp" line="366"/>
+ <location filename="../gui.cpp" line="371"/>
+ <location filename="../gui.cpp" line="372"/>
+ <location filename="../gui.cpp" line="659"/>
<source>minutes</source>
<translation>Minuten</translation>
</message>
<message>
- <location filename="../gui.cpp" line="290"/>
+ <location filename="../gui.cpp" line="381"/>
+ <location filename="../gui.cpp" line="382"/>
<source>seconds</source>
<translation>Sekunden</translation>
</message>
@@ -177,15 +233,25 @@
</message>
<message>
<location filename="../ui/gui.ui" line="206"/>
- <source>&lock after start?</source>
+ <source>&Lock after start?</source>
<translation>Nach dem Start &sperren?</translation>
</message>
<message>
<location filename="../ui/gui.ui" line="225"/>
- <source>&warnings on?</source>
+ <source>&Warnings on?</source>
<translation>&Warnungen an?</translation>
</message>
<message>
+ <location filename="../ui/gui.ui" line="390"/>
+ <source>Version 1.3.6</source>
+ <translation>Version 1.3.6</translation>
+ </message>
+ <message>
+ <location filename="../ui/gui.ui" line="408"/>
+ <source>You can set a date in the calendar</source>
+ <translation>Sie können ein Datum im Kalender einstellen</translation>
+ </message>
+ <message>
<location filename="../ui/gui.ui" line="300"/>
<source>&OK</source>
<translation>&OK</translation>
@@ -195,6 +261,11 @@
<source>&now!</source>
<translation>&Jetzt!</translation>
</message>
+ <message>
+ <location filename="../ui/gui.ui" line="411"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
</context>
<context>
<name>Preferences</name>
@@ -204,111 +275,179 @@
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="134"/>
- <source>Set minutes to countdown</source>
- <translation>Setze Minuten für Countdown</translation>
+ <location filename="../ui/preferences.ui" line="279"/>
+ <source>Enable the &target time at startup</source>
+ <translation>Aktiviere &Ziel-Zeit bei Programmstart</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="111"/>
- <source>Set a target time</source>
- <translation>Setze Ziel-Zeit</translation>
+ <location filename="../ui/preferences.ui" line="246"/>
+ <source>Shutdown</source>
+ <translation>Shutdown</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="212"/>
- <source>Enable the &target time at startup</source>
- <translation>Aktiviere &Ziel-Zeit bei Programmstart</translation>
+ <location filename="../ui/preferences.ui" line="73"/>
+ <source>Shutdown type:</source>
+ <translation>Shutdown-Art:</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="235"/>
- <source>Set if the checkbox for "&lock after start?" is
-checked at startup</source>
- <translation>Setze ob die Checkbox für "Nach dem Start
-&sperren?" bei Programmstart gesetzt sein soll</translation>
+ <location filename="../ui/preferences.ui" line="83"/>
+ <source>Target time:</source>
+ <translation>Ziel-Zeit:</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="246"/>
- <source>Set if the checkbox for "&warnings on?" is
-checked at startup</source>
- <translation>Setze ob die Checkbox für "&Warnungen an?"
-bei Programmstart gesetzt sein soll</translation>
+ <location filename="../ui/preferences.ui" line="90"/>
+ <source>Minutes to countdown:</source>
+ <translation>Minuten für Countdown:</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="75"/>
- <source>Shutdown</source>
- <translation>Shutdown</translation>
+ <location filename="../ui/preferences.ui" line="97"/>
+ <source>Font:</source>
+ <translation>Schriftart:</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="104"/>
+ <source>Font size 1:</source>
+ <translation>Schriftgröße 1:</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="80"/>
+ <location filename="../ui/preferences.ui" line="111"/>
+ <source>Font size 2:</source>
+ <translation>Schriftgröße 2:</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="118"/>
+ <source>Font size 3:</source>
+ <translation>Schriftgröße 3:</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="128"/>
+ <source>Size for log file:</source>
+ <translation>Größe der Protokolldatei:</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="239"/>
+ <source>What should be displayed first at startup?</source>
+ <translation>Was sollte bei Programmstart zuerst
+angezeigt werden?</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="251"/>
<source>Reboot</source>
<translation>Neustart</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="85"/>
+ <location filename="../ui/preferences.ui" line="256"/>
<source>Suspend</source>
<translation>Standby</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="90"/>
+ <location filename="../ui/preferences.ui" line="261"/>
<source>Hibernate</source>
<translation>Ruhezustand</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="98"/>
- <source>Set what should be shown first at startup </source>
- <translation>Setze was beim Programmstart
-zuerst angezeigt werden soll</translation>
+ <location filename="../ui/preferences.ui" line="135"/>
+ <source>What target time should be displayed
+at startup?</source>
+ <translation>Welche Ziel-Zeit soll bei Programmstart
+angezeigt werden?</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="148"/>
- <source>Font 1 (e.g. labels)</source>
- <translation>Schriftgröße 1
-(z.B. Beschriftungen)</translation>
+ <location filename="../ui/preferences.ui" line="143"/>
+ <source>How many minutes should be displayed
+for countdown at startup?</source>
+ <translation>Wie viele Minuten sollen bei Programmstart
+für den Countdown angezeigt werden?</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="162"/>
- <source>Font 2 (OK/Minimize button)</source>
- <translation>Schriftgröße 2
-(OK/Minimieren Knöpfe)</translation>
+ <location filename="../ui/preferences.ui" line="292"/>
+ <source>Enable the minute &countdown at startup</source>
+ <translation>Aktiviere den Minuten-&Countdown bei Programmstart</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="179"/>
- <source>Font 3 (checkboxes and "now!" button)</source>
- <translation>Schriftgröße 3
-(Checkboxen und "Jetzt!" Knopf)</translation>
+ <location filename="../ui/preferences.ui" line="40"/>
+ <source>&Reset settings</source>
+ <translation>&Einstellungen zurücksetzen</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="225"/>
- <source>Enable the minute &countdown at startup</source>
- <translation>Aktiviere den Minuten-&Countdown bei Programmstart</translation>
+ <location filename="../ui/preferences.ui" line="217"/>
+ <source>Size for log file in KB</source>
+ <translation>Größe der Protokolldatei in KB</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="257"/>
- <source>L&og start time of qshutdown and how long it was running</source>
- <translation>&Protokolliere die Startzeit von qshutdown und
-wie lange es gelaufen ist</translation>
+ <location filename="../ui/preferences.ui" line="299"/>
+ <source>Set if the checkbox for "Lock after start?"
+should be checked at startup</source>
+ <translation>Setze ob die Checkbox für
+"Nach dem Start sperren?" gesetzt sein soll</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="264"/>
- <source>&Start countdown at startup</source>
- <translation>Starte den &Countdown bei Programmstart</translation>
+ <location filename="../ui/preferences.ui" line="306"/>
+ <source>"&Lock after start?"</source>
+ <translation>"Nach dem Start &sperren?"</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="40"/>
- <source>&Reset settings</source>
- <translation>&Einstellungen zurücksetzen</translation>
+ <location filename="../ui/preferences.ui" line="313"/>
+ <source>Set if the checkbox for "Warnings on?"
+should be checked at startup</source>
+ <translation>Setze ob die Checkbox für
+"Warnungen an?" bei Programmstart
+gesetzt sein soll</translation>
</message>
<message>
- <location filename="../ui/preferences.ui" line="202"/>
- <source>Size for log file in KB</source>
- <translation>Größe der Protokolldatei in KB</translation>
+ <location filename="../ui/preferences.ui" line="320"/>
+ <source>"&Warnings on?"</source>
+ <translation>"&Warnungen an?"</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="337"/>
+ <source>Log start time of qshutdown and how long
+it was running</source>
+ <translation>Protokolliere die Startzeit von qshutdown
+und wie lange es gelaufen ist</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="344"/>
+ <source>L&ogging</source>
+ <translation>&Protokollieren</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="327"/>
+ <source>Start countdown at startup</source>
+ <translation>Starte den Countdown bei Programmstart</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="330"/>
+ <source>&Start countdown</source>
+ <translation>Starte &Countdown</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="201"/>
+ <source>checkboxes and "now!" button</source>
+ <translation>Checkboxen und "Jetzt!" Knopf</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="191"/>
+ <source>OK and Minimize buttons</source>
+ <translation>OK und MInimieren Knöpfe</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="181"/>
+ <source>Labels for example</source>
+ <translation>z.B Beschriftungen</translation>
+ </message>
+ <message>
+ <location filename="../ui/preferences.ui" line="169"/>
+ <source>Set a font</source>
+ <translation>Setze eine Schriftart</translation>
</message>
<message>
- <location filename="../preferences.cpp" line="42"/>
+ <location filename="../preferences.cpp" line="46"/>
<source>The File "</source>
<translation>Die Datei "</translation>
</message>
<message>
- <location filename="../preferences.cpp" line="42"/>
+ <location filename="../preferences.cpp" line="46"/>
<source>" is not writeable!
Maybe you just don't have the permissions to do so.</source>
<translation>" ist nicht beschreibbar!
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/main.cpp shutdown-qapps-1.4.4/qshutdown/src/main.cpp
--- shutdown-qapps-1.2.5/qshutdown/src/main.cpp 2010-06-20 15:40:50.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/main.cpp 2010-09-04 00:47:00.000000000 +0200
@@ -31,9 +31,8 @@
app.installTranslator(&qtTranslator);
//My translations
- QString lo = ":/locale/" + QLocale::system().name();
QTranslator translator;
- translator.load(lo);
+ translator.load(":/qshutdown/src/locale/" + QLocale::system().name());
app.installTranslator(&translator);
QString info = QString(QObject::tr("qshutdown will show it self 3 times as a warning "
@@ -88,9 +87,7 @@
#endif //Q_OS_WIN32
window.informations = info;
window.loadSettings();
- #ifdef Q_OS_WIN32
window.center();
- #endif //Q_OS_WIN32
window.show();
app.setQuitOnLastWindowClosed(false);
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/preferences.cpp shutdown-qapps-1.4.4/qshutdown/src/preferences.cpp
--- shutdown-qapps-1.2.5/qshutdown/src/preferences.cpp 2010-06-18 17:51:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/preferences.cpp 2010-08-22 16:10:48.000000000 +0200
@@ -18,6 +18,10 @@
#include "preferences.h"
extern bool timeRunning; //varibale declared in gui.cpp
+QString fonts;
+int fontS1 = 13;
+int fontS2 = 18;
+int fontS3 = 11;
Preferences::Preferences(QWidget *parent): QDialog(parent){
@@ -44,6 +48,11 @@
connect(buttonBox, SIGNAL(accepted()), this, SLOT(saveToConfFile()));
connect(reset, SIGNAL(clicked(bool)), this, SLOT(resetSettings()));
+ connect(font1Spin, SIGNAL(valueChanged(int)), this, SLOT(fontSize1Changed(int)));
+ connect(font2Spin, SIGNAL(valueChanged(int)), this, SLOT(fontSize2Changed(int)));
+ connect(font3Spin, SIGNAL(valueChanged(int)), this, SLOT(fontSize3Changed(int)));
+ connect(fontComboBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(fontChanged(QString)));
+ connect(buttonBox, SIGNAL(rejected()), this, SLOT(resetFont()));
}
Preferences::~Preferences(){ delete settings; }
@@ -59,10 +68,13 @@
}
void Preferences::loadSettings(){
+ if(settings->contains("PrefWindowSize/size"))
+ resize(settings->value("PrefWindowSize/size").toSize());
comboBox->setCurrentIndex(settings->value("Power/comboBox").toInt());
timeEdit->setTime(QTime(settings->value("Time/time_hour").toInt(),settings->value("Time/time_minute").toInt()));
spin->setValue(settings->value("Time/countdown_minutes").toInt());
countdown->setChecked(settings->value("Time/countdown_at_startup").toBool());
+ fontComboBox->setCurrentFont(settings->value("Fonts/font_type").toString());
font1Spin->setValue(settings->value("Fonts/font1").toInt());
font2Spin->setValue(settings->value("Fonts/font2").toInt());
font3Spin->setValue(settings->value("Fonts/font3").toInt());
@@ -81,6 +93,7 @@
settings->setValue("Time/time_minute", timeEdit->time().minute());
settings->setValue("Time/countdown_at_startup", countdown->isChecked());
settings->setValue("Time/countdown_minutes", spin->value());
+ settings->setValue("Fonts/font_type", fontComboBox->currentText());
settings->setValue("Fonts/font1", font1Spin->value());
settings->setValue("Fonts/font2", font2Spin->value());
settings->setValue("Fonts/font3", font3Spin->value());
@@ -99,6 +112,7 @@
timeEdit->setTime(QTime(22,00));
countdown->setChecked(false);
spin->setValue(60);
+ fontComboBox->setCurrentFont(QFont("Times New Roman"));
font1Spin->setValue(13);
font2Spin->setValue(18);
font3Spin->setValue(11);
@@ -114,5 +128,24 @@
void Preferences::closeEvent(QCloseEvent* window_close){
if(!timeRunning)
finishing(); //sends SIGNAL finishing()
+ if(settings->isWritable())
+ settings->setValue("PrefWindowSize/size", size());
+
QDialog::closeEvent(window_close);
}
+
+void Preferences::fontChanged(QString font){ fonts = font; changeFont(); }
+
+void Preferences::fontSize1Changed(int f1){ fontS1 = f1; changeFont(); }
+
+void Preferences::fontSize2Changed(int f2){ fontS2 = f2; changeFont(); }
+
+void Preferences::fontSize3Changed(int f3){ fontS3 = f3; changeFont(); }
+
+void Preferences::resetFont(){
+ fonts = settings->value("Fonts/font_type").toString();
+ fontS1 = settings->value("Fonts/font1").toInt();
+ fontS2 = settings->value("Fonts/font2").toInt();
+ fontS3 = settings->value("Fonts/font3").toInt();
+ changeFont();
+}
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/preferences.h shutdown-qapps-1.4.4/qshutdown/src/preferences.h
--- shutdown-qapps-1.2.5/qshutdown/src/preferences.h 2010-06-18 17:51:30.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/preferences.h 2010-08-20 12:28:47.000000000 +0200
@@ -36,10 +36,16 @@
void loadSettings();
void saveToConfFile();
void resetSettings();
+ void fontChanged(QString font);
+ void resetFont();
+ void fontSize1Changed(int f1);
+ void fontSize2Changed(int f2);
+ void fontSize3Changed(int f3);
signals:
void starting();
void finishing();
+ void changeFont();
protected:
virtual void showEvent(QShowEvent* show_pref);
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/resource.qrc shutdown-qapps-1.4.4/qshutdown/src/resource.qrc
--- shutdown-qapps-1.2.5/qshutdown/src/resource.qrc 2010-06-18 17:51:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/resource.qrc 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-<RCC>
- <qresource prefix="/" >
- <file>locale/de.qm</file>
- <file>pixmap/red_glasses.xpm</file>
- </qresource>
-</RCC>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/ui/calendar.ui shutdown-qapps-1.4.4/qshutdown/src/ui/calendar.ui
--- shutdown-qapps-1.2.5/qshutdown/src/ui/calendar.ui 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/qshutdown/src/ui/calendar.ui 2010-09-06 18:26:24.000000000 +0200
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Calendar</class>
+ <widget class="QDialog" name="Calendar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>272</width>
+ <height>230</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Calendar</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="../../../qshutdown.qrc">
+ <normaloff>:/red_glasses</normaloff>:/red_glasses</iconset>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QCalendarWidget" name="calendarWidget"/>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../../../qshutdown.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>Calendar</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>Calendar</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/ui/gui.ui shutdown-qapps-1.4.4/qshutdown/src/ui/gui.ui
--- shutdown-qapps-1.2.5/qshutdown/src/ui/gui.ui 2010-06-18 17:51:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/ui/gui.ui 2010-09-06 18:33:25.000000000 +0200
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>405</width>
- <height>335</height>
+ <height>336</height>
</rect>
</property>
<property name="sizePolicy">
@@ -20,8 +20,8 @@
<string>'qshutdown'</string>
</property>
<property name="windowIcon">
- <iconset resource="../resource.qrc">
- <normaloff>:/pixmap/red_glasses.xpm</normaloff>:/pixmap/red_glasses.xpm</iconset>
+ <iconset resource="../../../qshutdown.qrc">
+ <normaloff>:/red_glasses</normaloff>:/red_glasses</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
@@ -34,12 +34,12 @@
<number>55</number>
</property>
<property name="bottomMargin">
- <number>20</number>
+ <number>5</number>
</property>
<property name="verticalSpacing">
<number>15</number>
</property>
- <item row="0" column="0">
+ <item row="0" column="0" colspan="2">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -192,7 +192,7 @@
</layout>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout3">
<item row="0" column="0">
<widget class="QCheckBox" name="lock">
@@ -203,7 +203,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>&lock after start?</string>
+ <string>&Lock after start?</string>
</property>
</widget>
</item>
@@ -222,13 +222,13 @@
</size>
</property>
<property name="text">
- <string>&warnings on?</string>
+ <string>&Warnings on?</string>
</property>
</widget>
</item>
</layout>
</item>
- <item row="2" column="0">
+ <item row="2" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout4">
<property name="horizontalSpacing">
<number>15</number>
@@ -283,7 +283,7 @@
</item>
</layout>
</item>
- <item row="3" column="0">
+ <item row="3" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout5" columnstretch="0,0,0">
<property name="horizontalSpacing">
<number>15</number>
@@ -379,10 +379,44 @@
</item>
</layout>
</item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="version">
+ <property name="font">
+ <font>
+ <pointsize>8</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Version 1.3.6</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QToolButton" name="toolButton">
+ <property name="minimumSize">
+ <size>
+ <width>35</width>
+ <height>15</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>8</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>You can set a date in the calendar</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>
<tabstop>ok</tabstop>
+ <tabstop>toolButton</tabstop>
<tabstop>lock</tabstop>
<tabstop>warnings</tabstop>
<tabstop>comboBox</tabstop>
@@ -393,7 +427,7 @@
<tabstop>now</tabstop>
</tabstops>
<resources>
- <include location="../resource.qrc"/>
+ <include location="../../../qshutdown.qrc"/>
</resources>
<connections>
<connection>
@@ -403,12 +437,12 @@
<slot>setFocus()</slot>
<hints>
<hint type="sourcelabel">
- <x>289</x>
- <y>37</y>
+ <x>339</x>
+ <y>88</y>
</hint>
<hint type="destinationlabel">
- <x>190</x>
- <y>240</y>
+ <x>248</x>
+ <y>299</y>
</hint>
</hints>
</connection>
@@ -419,12 +453,12 @@
<slot>setFocus()</slot>
<hints>
<hint type="sourcelabel">
- <x>289</x>
- <y>70</y>
+ <x>339</x>
+ <y>121</y>
</hint>
<hint type="destinationlabel">
- <x>190</x>
- <y>240</y>
+ <x>248</x>
+ <y>299</y>
</hint>
</hints>
</connection>
@@ -435,12 +469,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>238</x>
- <y>57</y>
+ <x>262</x>
+ <y>84</y>
</hint>
<hint type="destinationlabel">
- <x>294</x>
- <y>57</y>
+ <x>339</x>
+ <y>88</y>
</hint>
</hints>
</connection>
@@ -451,12 +485,12 @@
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>238</x>
- <y>80</y>
+ <x>262</x>
+ <y>117</y>
</hint>
<hint type="destinationlabel">
- <x>294</x>
- <y>80</y>
+ <x>339</x>
+ <y>121</y>
</hint>
</hints>
</connection>
diff -Nru shutdown-qapps-1.2.5/qshutdown/src/ui/preferences.ui shutdown-qapps-1.4.4/qshutdown/src/ui/preferences.ui
--- shutdown-qapps-1.2.5/qshutdown/src/ui/preferences.ui 2010-06-18 17:51:29.000000000 +0200
+++ shutdown-qapps-1.4.4/qshutdown/src/ui/preferences.ui 2010-09-06 18:33:59.000000000 +0200
@@ -6,16 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
- <width>445</width>
- <height>630</height>
+ <width>378</width>
+ <height>552</height>
</rect>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
<property name="windowIcon">
- <iconset resource="../resource.qrc">
- <normaloff>:/pixmap/red_glasses.xpm</normaloff>:/pixmap/red_glasses.xpm</iconset>
+ <iconset resource="../../../qshutdown.qrc">
+ <normaloff>:/red_glasses</normaloff>:/red_glasses</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="18" column="1" colspan="2">
@@ -54,216 +54,298 @@
<rect>
<x>0</x>
<y>0</y>
- <width>425</width>
- <height>496</height>
+ <width>356</width>
+ <height>418</height>
</rect>
</property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QComboBox" name="comboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <property name="horizontalSpacing">
+ <number>0</number>
+ </property>
+ <property name="verticalSpacing">
+ <number>2</number>
</property>
- <property name="sizeAdjustPolicy">
- <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Shutdown type:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="timeLabel">
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Target time:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="spinLabel">
+ <property name="text">
+ <string>Minutes to countdown:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="font1Label">
+ <property name="text">
+ <string>Font size 1:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="font2Label">
+ <property name="text">
+ <string>Font size 2:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="font3Label">
+ <property name="text">
+ <string>Font size 3:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="label">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="text">
+ <string>Size for log file:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QTimeEdit" name="timeEdit">
+ <property name="toolTip">
+ <string>What target time should be displayed
+at startup?</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="spin">
+ <property name="toolTip">
+ <string>How many minutes should be displayed
+for countdown at startup?</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>1440</number>
+ </property>
+ <property name="singleStep">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>1</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QFontComboBox" name="fontComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Set a font</string>
+ </property>
+ <property name="currentFont">
+ <font>
+ <family>Times New Roman</family>
+ </font>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QSpinBox" name="font1Spin">
+ <property name="toolTip">
+ <string>Labels for example</string>
+ </property>
+ <property name="minimum">
+ <number>6</number>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QSpinBox" name="font2Spin">
+ <property name="toolTip">
+ <string>OK and Minimize buttons</string>
+ </property>
+ <property name="minimum">
+ <number>6</number>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QSpinBox" name="font3Spin">
+ <property name="toolTip">
+ <string>checkboxes and "now!" button</string>
+ </property>
+ <property name="minimum">
+ <number>6</number>
+ </property>
+ <property name="value">
+ <number>6</number>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QDoubleSpinBox" name="spinBox">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Size for log file in KB</string>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="minimum">
+ <double>1.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>0.100000000000000</double>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="comboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>What should be displayed first at startup?</string>
+ </property>
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+ </property>
+ <item>
+ <property name="text">
+ <string>Shutdown</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Reboot</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Suspend</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Hibernate</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>4</number>
</property>
<item>
- <property name="text">
- <string>Shutdown</string>
- </property>
+ <widget class="QRadioButton" name="radio1">
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Enable the &target time at startup</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>Reboot</string>
- </property>
+ <widget class="QRadioButton" name="radio2">
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Enable the minute &countdown at startup</string>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>Suspend</string>
- </property>
+ <widget class="QCheckBox" name="lock">
+ <property name="toolTip">
+ <string>Set if the checkbox for "Lock after start?"
+should be checked at startup</string>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>"&Lock after start?"</string>
+ </property>
+ </widget>
</item>
<item>
- <property name="text">
- <string>Hibernate</string>
- </property>
+ <widget class="QCheckBox" name="warn">
+ <property name="toolTip">
+ <string>Set if the checkbox for "Warnings on?"
+should be checked at startup</string>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>"&Warnings on?"</string>
+ </property>
+ </widget>
</item>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLabel" name="comboLabel">
- <property name="text">
- <string>Set what should be shown first at startup </string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QTimeEdit" name="timeEdit"/>
- </item>
- <item row="1" column="1">
- <widget class="QLabel" name="timeLabel">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set a target time</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QSpinBox" name="spin">
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>1440</number>
- </property>
- <property name="singleStep">
- <number>1</number>
- </property>
- <property name="value">
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLabel" name="spinLabel">
- <property name="text">
- <string>Set minutes to countdown</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QSpinBox" name="font1Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLabel" name="font1Label">
- <property name="text">
- <string>Font 1 (e.g. labels)</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QSpinBox" name="font2Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLabel" name="font2Label">
- <property name="text">
- <string>Font 2 (OK/Minimize button)</string>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QSpinBox" name="font3Spin">
- <property name="minimum">
- <number>6</number>
- </property>
- <property name="value">
- <number>6</number>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLabel" name="font3Label">
- <property name="text">
- <string>Font 3 (checkboxes and "now!" button)</string>
- </property>
- </widget>
- </item>
- <item row="6" column="0">
- <widget class="QDoubleSpinBox" name="spinBox">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="decimals">
- <number>1</number>
- </property>
- <property name="minimum">
- <double>1.000000000000000</double>
- </property>
- <property name="singleStep">
- <double>0.100000000000000</double>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Size for log file in KB</string>
- </property>
- </widget>
- </item>
- <item row="7" column="0" colspan="2">
- <widget class="QRadioButton" name="radio1">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Enable the &target time at startup</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="8" column="0" colspan="2">
- <widget class="QRadioButton" name="radio2">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Enable the minute &countdown at startup</string>
- </property>
- </widget>
- </item>
- <item row="9" column="0" colspan="2">
- <widget class="QCheckBox" name="lock">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set if the checkbox for "&lock after start?" is
-checked at startup</string>
- </property>
- </widget>
- </item>
- <item row="10" column="0" colspan="2">
- <widget class="QCheckBox" name="warn">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>Set if the checkbox for "&warnings on?" is
-checked at startup</string>
- </property>
- </widget>
- </item>
- <item row="12" column="0" colspan="2">
- <widget class="QCheckBox" name="log">
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
- </property>
- <property name="text">
- <string>L&og start time of qshutdown and how long it was running</string>
- </property>
- </widget>
- </item>
- <item row="11" column="0" colspan="2">
- <widget class="QCheckBox" name="countdown">
- <property name="text">
- <string>&Start countdown at startup</string>
- </property>
- </widget>
+ <item>
+ <widget class="QCheckBox" name="countdown">
+ <property name="toolTip">
+ <string>Start countdown at startup</string>
+ </property>
+ <property name="text">
+ <string>&Start countdown</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="log">
+ <property name="toolTip">
+ <string>Log start time of qshutdown and how long
+it was running</string>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>L&ogging</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -289,31 +371,18 @@
</widget>
<tabstops>
<tabstop>scrollArea</tabstop>
- <tabstop>comboBox</tabstop>
- <tabstop>timeEdit</tabstop>
- <tabstop>spin</tabstop>
- <tabstop>font1Spin</tabstop>
- <tabstop>font2Spin</tabstop>
- <tabstop>font3Spin</tabstop>
- <tabstop>spinBox</tabstop>
- <tabstop>radio1</tabstop>
- <tabstop>radio2</tabstop>
- <tabstop>lock</tabstop>
- <tabstop>warn</tabstop>
- <tabstop>countdown</tabstop>
- <tabstop>log</tabstop>
<tabstop>reset</tabstop>
<tabstop>buttonBox</tabstop>
</tabstops>
<resources>
- <include location="../resource.qrc"/>
+ <include location="../../../qshutdown.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>Preferences</receiver>
- <slot>accept()</slot>
+ <slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>400</x>
@@ -329,7 +398,7 @@
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Preferences</receiver>
- <slot>reject()</slot>
+ <slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>432</x>
diff -Nru shutdown-qapps-1.2.5/qshutdown.qrc shutdown-qapps-1.4.4/qshutdown.qrc
--- shutdown-qapps-1.2.5/qshutdown.qrc 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/qshutdown.qrc 2010-09-03 18:05:59.000000000 +0200
@@ -0,0 +1,7 @@
+<RCC>
+ <qresource prefix="/">
+ <file alias="version">version.txt</file>
+ <file>qshutdown/src/locale/de.qm</file>
+ <file alias="red_glasses">qshutdown/src/pixmap/red_glasses.xpm</file>
+ </qresource>
+</RCC>
diff -Nru shutdown-qapps-1.2.5/version.txt shutdown-qapps-1.4.4/version.txt
--- shutdown-qapps-1.2.5/version.txt 1970-01-01 01:00:00.000000000 +0100
+++ shutdown-qapps-1.4.4/version.txt 2010-09-12 02:05:08.000000000 +0200
@@ -0,0 +1 @@
+Version 1.4.4
Reply to: