Hello community, here is the log from the commit of package QTalarm for openSUSE:Factory checked in at 2020-12-02 13:59:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/QTalarm (Old) and /work/SRC/openSUSE:Factory/.QTalarm.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QTalarm" Wed Dec 2 13:59:07 2020 rev:4 rq:852556 version:2.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/QTalarm/QTalarm.changes 2020-11-09 13:58:58.279759980 +0100 +++ /work/SRC/openSUSE:Factory/.QTalarm.new.5913/QTalarm.changes 2020-12-02 13:59:07.913858705 +0100 @@ -1,0 +2,6 @@ +Tue Dec 1 07:42:07 UTC 2020 - Martin Hauke <[email protected]> + +- Update to version 2.1.1 + * Added manual monochrome tray icon option + +------------------------------------------------------------------- Old: ---- QTalarm-2.1.0.tar.gz New: ---- QTalarm-2.1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ QTalarm.spec ++++++ --- /var/tmp/diff_new_pack.LkY6dZ/_old 2020-12-02 13:59:08.629859460 +0100 +++ /var/tmp/diff_new_pack.LkY6dZ/_new 2020-12-02 13:59:08.629859460 +0100 @@ -18,7 +18,7 @@ %define _name qtalarm Name: QTalarm -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: A handy alarm clock Program written in QT License: GPL-3.0-only ++++++ QTalarm-2.1.0.tar.gz -> QTalarm-2.1.1.tar.gz ++++++ Binary files old/QTalarm-2.1.0/Icons/1349069370_Alarm_Clock_mono.png and new/QTalarm-2.1.1/Icons/1349069370_Alarm_Clock_mono.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/Icons.qrc new/QTalarm-2.1.1/Icons.qrc --- old/QTalarm-2.1.0/Icons.qrc 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/Icons.qrc 2020-11-30 18:31:18.000000000 +0100 @@ -1,8 +1,10 @@ <RCC> <qresource prefix="/new/icons"> <file alias="Clock.png">Icons/1349069370_Alarm_Clock.png</file> + <file alias="mono.png">Icons/1349069370_Alarm_Clock_mono.png</file> </qresource> <qresource prefix="/new/sounds"> <file alias="alarm.ogg">Sounds/condition_one.ogg</file> </qresource> + <qresource prefix="/"/> </RCC> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/README.md new/QTalarm-2.1.1/README.md --- old/QTalarm-2.1.0/README.md 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/README.md 2020-11-30 18:31:18.000000000 +0100 @@ -21,6 +21,35 @@ - Completely Cross plateform +## Linux Build/Install + +### Building +1. Ensure QT5 is installed on your system. +1. In the termnal, type `qmake` This will create a Makefile +1. type `make` + +### Installing + +1. copy the qtalarm binary into /usr/bin (sudo cp qtalarm /usr/bin). +2. inside of the source code directory, there is a directory called "Icons." These icons need to be copied with the following commands: + - `sudo cp 1349069370_Alarm_Clock.png /usr/share/icons/hicolor/48x48/apps/` + - `sudo cp Icons/1349069370_Alarm_Clock24.png /usr/share/icons/hicolor/24x24/apps/1349069370_Alarm_Clock.png` + - `sudo cp 1349069370_Alarm_Clock16.png /usr/share/icons/hicolor/16x16/apps/1349069370_Alarm_Clock.png` +3. Last step. We need to create a "Desktop Entry" file to include QTalarm in your systems list of programs. Save the following text into a file called qtalarm.desktop located here /usr/share/applications/qtalarm.desktop + +``` +[Desktop Entry] +Encoding=UTF-8 +Value=1.0 +Type=Application +Name=QTalarm +GenericName=QTalarm +Comment= A nifty alarm clock written in QT +Icon=1349069370_Alarm_Clock.png +Exec=qtalarm +Categories=Application;Utility; +``` +4. QTalarm Should now be installed. Licensing ========== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/aboutdialog.h new/QTalarm-2.1.1/aboutdialog.h --- old/QTalarm-2.1.0/aboutdialog.h 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/aboutdialog.h 2020-11-30 18:31:18.000000000 +0100 @@ -14,7 +14,7 @@ public: explicit AboutDialog(QWidget *parent = 0); ~AboutDialog(); - const QString version="2.1.0"; + const QString version="2.1.1"; private: Ui::AboutDialog *ui; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/fileio.cpp new/QTalarm-2.1.1/fileio.cpp --- old/QTalarm-2.1.0/fileio.cpp 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/fileio.cpp 2020-11-30 18:31:18.000000000 +0100 @@ -143,7 +143,19 @@ return settings.value("isMilTime").toBool(); } -void FileIO::SaveTimeMode(bool isMilTime) +bool FileIO::LoadisMono() +{ + QSettings settings; + return settings.value("isMono").toBool(); +} + +void FileIO::SaveisMono(bool isMono) +{ + QSettings settings; + settings.setValue("isMono",isMono); +} + +void FileIO::SaveisMilTime(bool isMilTime) { QSettings settings; settings.setValue("isMilTime",isMilTime); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/fileio.h new/QTalarm-2.1.1/fileio.h --- old/QTalarm-2.1.0/fileio.h 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/fileio.h 2020-11-30 18:31:18.000000000 +0100 @@ -21,7 +21,9 @@ static bool LoadWindowShow(); static void SaveWindowShow(bool); static bool isMilTime(); - static void SaveTimeMode(bool isMilTime); + static bool LoadisMono(); + static void SaveisMono(bool); + static void SaveisMilTime(bool isMilTime); static bool LoadWarnOnPm(); static void SaveWarnOnPm(bool); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/mainwindow.cpp new/QTalarm-2.1.1/mainwindow.cpp --- old/QTalarm-2.1.0/mainwindow.cpp 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/mainwindow.cpp 2020-11-30 18:31:18.000000000 +0100 @@ -64,7 +64,12 @@ trayIconMenu->addSeparator(); trayIconMenu->addAction(QAquit); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setIcon(QIcon(":/new/icons/Clock.png")); + if(FileIO::LoadisMono()) + { + trayIcon->setIcon(QIcon(":/new/icons/mono.png")); + }else{ + trayIcon->setIcon(QIcon(":/new/icons/Clock.png")); + } trayIcon->setToolTip("QTalarm"); trayIcon->show(); @@ -372,7 +377,7 @@ void MainWindow::ShowSettings() { - SettingDialog *settingsPage=new SettingDialog(this,&_isMilTime, &_WarnOnPm); + SettingDialog *settingsPage=new SettingDialog(this,&_isMilTime, &_WarnOnPm, trayIcon); settingsPage->show(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/settingdialog.cpp new/QTalarm-2.1.1/settingdialog.cpp --- old/QTalarm-2.1.0/settingdialog.cpp 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/settingdialog.cpp 2020-11-30 18:31:18.000000000 +0100 @@ -1,14 +1,16 @@ +#include <QSystemTrayIcon> #include "settingdialog.h" #include "ui_settingdialog.h" #include "fileio.h" -SettingDialog::SettingDialog(QWidget *parent,bool *isMilTime, bool *WarnOnPm) : +SettingDialog::SettingDialog(QWidget *parent,bool *isMilTime, bool *WarnOnPm, QSystemTrayIcon *trayIcon) : QDialog(parent), ui(new Ui::SettingDialog) { ui->setupUi(this); _isMilTime=isMilTime; _WarnOnPm=WarnOnPm; + _trayIcon=trayIcon; if(*_isMilTime) { @@ -20,6 +22,7 @@ ui->milTime->setChecked(*_isMilTime); ui->defaultShow->setChecked(FileIO::LoadWindowShow()); + ui->chk_mono->setChecked(FileIO::LoadisMono()); connect(ui->buttonBox,SIGNAL(accepted()),this,SLOT(Save())); connect(ui->plebTime,SIGNAL(clicked(bool)),this,SLOT(toggleWarnBox())); @@ -37,8 +40,15 @@ FileIO::SaveWindowShow(ui->defaultShow->isChecked()); *_isMilTime=ui->milTime->isChecked(); *_WarnOnPm=ui->WarnBox->isChecked(); - FileIO::SaveTimeMode(*_isMilTime); + FileIO::SaveisMilTime(*_isMilTime); FileIO::SaveWarnOnPm(*_WarnOnPm); + FileIO::SaveisMono(ui->chk_mono->isChecked()); + if(ui->chk_mono->isChecked()) + { + _trayIcon->setIcon(QIcon(":/new/icons/mono.png")); + }else{ + _trayIcon->setIcon(QIcon(":/new/icons/Clock.png")); + } this->deleteLater(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/settingdialog.h new/QTalarm-2.1.1/settingdialog.h --- old/QTalarm-2.1.0/settingdialog.h 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/settingdialog.h 2020-11-30 18:31:18.000000000 +0100 @@ -2,6 +2,7 @@ #define SETTINGDIALOG_H #include <QDialog> +#include <QSystemTrayIcon> namespace Ui { class SettingDialog; @@ -12,13 +13,14 @@ Q_OBJECT public: - explicit SettingDialog(QWidget *parent = 0,bool *isMilTime=0, bool *WarnOnPm=0); + explicit SettingDialog(QWidget *parent = 0,bool *isMilTime=0, bool *WarnOnPm=0, QSystemTrayIcon *trayIcon=0); ~SettingDialog(); private: Ui::SettingDialog *ui; bool *_isMilTime; bool *_WarnOnPm; + QSystemTrayIcon *_trayIcon; private slots: void Save(); void toggleWarnBox(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QTalarm-2.1.0/settingdialog.ui new/QTalarm-2.1.1/settingdialog.ui --- old/QTalarm-2.1.0/settingdialog.ui 2020-11-06 23:53:42.000000000 +0100 +++ new/QTalarm-2.1.1/settingdialog.ui 2020-11-30 18:31:18.000000000 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>327</width> - <height>182</height> + <height>212</height> </rect> </property> <property name="windowTitle"> @@ -53,7 +53,14 @@ <item> <widget class="QCheckBox" name="WarnBox"> <property name="text"> - <string>Warn on Pm alarms</string> + <string>Warn on Pm Alarms</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="chk_mono"> + <property name="text"> + <string>Use Monochrome Icons</string> </property> </widget> </item> _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
