diff --git a/Icons.qrc b/Icons.qrc deleted file mode 100644 index 23f25cf..0000000 --- a/Icons.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - Icons/1349069370_Alarm_Clock.png - Icons/1349069370_Alarm_Clock_mono.png - - - Sounds/condition_one.ogg - - - diff --git a/QTalarm.pro b/QTalarm.pro deleted file mode 100644 index d1b62bd..0000000 --- a/QTalarm.pro +++ /dev/null @@ -1,46 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-09-30T18:05:49 -# -#------------------------------------------------- - -QT += core gui multimedia - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = qtalarm -TEMPLATE = app - - -SOURCES += main.cpp\ - bastardsnooze.cpp \ - mainwindow.cpp \ - schedulemodel.cpp \ - timer.cpp \ - alarm.cpp \ - fileio.cpp \ - schedules.cpp \ - aboutdialog.cpp \ - snooze.cpp \ - settingdialog.cpp - -HEADERS += mainwindow.h \ - bastardsnooze.h \ - schedulemodel.h \ - timer.h \ - alarm.h \ - fileio.h \ - schedules.h \ - aboutdialog.h \ - snooze.h \ - settingdialog.h - -FORMS += mainwindow.ui \ - aboutdialog.ui \ - bastardsnooze.ui \ - snooze.ui \ - settingdialog.ui - -RESOURCES += \ - Icons.qrc -CONFIG += precompile_header diff --git a/icons.qrc b/icons.qrc new file mode 100644 index 0000000..aa20a3f --- /dev/null +++ b/icons.qrc @@ -0,0 +1,10 @@ + + + icons/1349069370_alarm_clock.png + icons/1349069370_alarm_clock_mono.png + + + sounds/condition_one.ogg + + + diff --git a/Icons/1349069370_Alarm_Clock.png b/icons/1349069370_alarm_clock.png similarity index 100% rename from Icons/1349069370_Alarm_Clock.png rename to icons/1349069370_alarm_clock.png diff --git a/Icons/1349069370_Alarm_Clock16.png b/icons/1349069370_alarm_clock16.png similarity index 100% rename from Icons/1349069370_Alarm_Clock16.png rename to icons/1349069370_alarm_clock16.png diff --git a/Icons/1349069370_Alarm_Clock24.png b/icons/1349069370_alarm_clock24.png similarity index 100% rename from Icons/1349069370_Alarm_Clock24.png rename to icons/1349069370_alarm_clock24.png diff --git a/Icons/1349069370_Alarm_Clock_mono.png b/icons/1349069370_alarm_clock_mono.png similarity index 100% rename from Icons/1349069370_Alarm_Clock_mono.png rename to icons/1349069370_alarm_clock_mono.png diff --git a/qtalarm.pro b/qtalarm.pro new file mode 100644 index 0000000..bbd2245 --- /dev/null +++ b/qtalarm.pro @@ -0,0 +1,57 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2012-09-30T18:05:49 +# +#------------------------------------------------- + +QT += core gui multimedia + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +TARGET = qtalarm +TEMPLATE = app + + +SOURCES += \ + src/bastardsnooze.cpp \ + src/schedulemodel.cpp \ + src/timer.cpp \ + src/alarm.cpp \ + src/fileio.cpp \ + src/schedules.cpp \ + src/aboutdialog.cpp \ + src/snooze.cpp \ + src/settingdialog.cpp \ + src/mainwindow.cpp \ + src/main.cpp + +HEADERS += \ + src/bastardsnooze.h \ + src/schedulemodel.h \ + src/timer.h \ + src/alarm.h \ + src/fileio.h \ + src/schedules.h \ + src/aboutdialog.h \ + src/snooze.h \ + src/settingdialog.h \ + src/mainwindow.h + +FORMS += \ + src/aboutdialog.ui \ + src/bastardsnooze.ui \ + src/snooze.ui \ + src/settingdialog.ui \ + src/mainwindow.ui + +RESOURCES += \ + icons.qrc + +CONFIG += precompile_header + +# build dir +UI_DIR = build +MOC_DIR = build +RCC_DIR = build +OBJECTS_DIR = build +mytarget.commands += $${QMAKE_MKDIR} build diff --git a/Sounds/condition_one.ogg b/sounds/condition_one.ogg similarity index 100% rename from Sounds/condition_one.ogg rename to sounds/condition_one.ogg diff --git a/aboutdialog.cpp b/src/aboutdialog.cpp similarity index 96% rename from aboutdialog.cpp rename to src/aboutdialog.cpp index 6b0e6d6..ce785ad 100644 --- a/aboutdialog.cpp +++ b/src/aboutdialog.cpp @@ -9,7 +9,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->setupUi(this); //set Icon info QPixmap image; - image.load(":/new/icons/Clock.png"); + image.load(":/new/icons/clock.png"); ui->lblIcon->setPixmap(image); QString InfoText; diff --git a/aboutdialog.h b/src/aboutdialog.h similarity index 100% rename from aboutdialog.h rename to src/aboutdialog.h diff --git a/aboutdialog.ui b/src/aboutdialog.ui similarity index 97% rename from aboutdialog.ui rename to src/aboutdialog.ui index 46626bb..14e9110 100644 --- a/aboutdialog.ui +++ b/src/aboutdialog.ui @@ -21,7 +21,7 @@ - :/new/icons/Clock.png:/new/icons/Clock.png + :/new/icons/clock.png:/new/icons/clock.png true diff --git a/alarm.cpp b/src/alarm.cpp similarity index 100% rename from alarm.cpp rename to src/alarm.cpp diff --git a/alarm.h b/src/alarm.h similarity index 100% rename from alarm.h rename to src/alarm.h diff --git a/bastardsnooze.cpp b/src/bastardsnooze.cpp similarity index 100% rename from bastardsnooze.cpp rename to src/bastardsnooze.cpp diff --git a/bastardsnooze.h b/src/bastardsnooze.h similarity index 100% rename from bastardsnooze.h rename to src/bastardsnooze.h diff --git a/bastardsnooze.ui b/src/bastardsnooze.ui similarity index 100% rename from bastardsnooze.ui rename to src/bastardsnooze.ui diff --git a/fileio.cpp b/src/fileio.cpp similarity index 100% rename from fileio.cpp rename to src/fileio.cpp diff --git a/fileio.h b/src/fileio.h similarity index 100% rename from fileio.h rename to src/fileio.h diff --git a/main.cpp b/src/main.cpp similarity index 100% rename from main.cpp rename to src/main.cpp diff --git a/mainwindow.cpp b/src/mainwindow.cpp similarity index 99% rename from mainwindow.cpp rename to src/mainwindow.cpp index 4534123..1e8563d 100644 --- a/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -529,7 +529,7 @@ void MainWindow::SendTrayMessage(QString title, QString message) { icon = QIcon(":/new/icons/mono.png"); }else{ - icon = QIcon(":/new/icons/Clock.png"); + icon = QIcon(":/new/icons/clock.png"); } trayIcon->showMessage(title,message,icon); FileIO::SaveSeenSolveText(); @@ -543,7 +543,7 @@ void MainWindow::ChangeIconToDefault() { this->trayIcon->setIcon(QIcon(":/new/icons/mono.png")); }else{ - this->trayIcon->setIcon(QIcon(":/new/icons/Clock.png")); + this->trayIcon->setIcon(QIcon(":/new/icons/clock.png")); } } diff --git a/mainwindow.h b/src/mainwindow.h similarity index 100% rename from mainwindow.h rename to src/mainwindow.h diff --git a/mainwindow.ui b/src/mainwindow.ui similarity index 99% rename from mainwindow.ui rename to src/mainwindow.ui index d9d6fc2..31e1142 100644 --- a/mainwindow.ui +++ b/src/mainwindow.ui @@ -18,7 +18,7 @@ - :/new/icons/Clock.png:/new/icons/Clock.png + :/new/icons/clock.png:/new/icons/clock.png false diff --git a/schedulemodel.cpp b/src/schedulemodel.cpp similarity index 100% rename from schedulemodel.cpp rename to src/schedulemodel.cpp diff --git a/schedulemodel.h b/src/schedulemodel.h similarity index 100% rename from schedulemodel.h rename to src/schedulemodel.h diff --git a/schedules.cpp b/src/schedules.cpp similarity index 100% rename from schedules.cpp rename to src/schedules.cpp diff --git a/schedules.h b/src/schedules.h similarity index 100% rename from schedules.h rename to src/schedules.h diff --git a/settingdialog.cpp b/src/settingdialog.cpp similarity index 96% rename from settingdialog.cpp rename to src/settingdialog.cpp index 0a36e2d..c8fe883 100644 --- a/settingdialog.cpp +++ b/src/settingdialog.cpp @@ -47,7 +47,7 @@ void SettingDialog::Save() { _trayIcon->setIcon(QIcon(":/new/icons/mono.png")); }else{ - _trayIcon->setIcon(QIcon(":/new/icons/Clock.png")); + _trayIcon->setIcon(QIcon(":/new/icons/clock.png")); } this->deleteLater(); } diff --git a/settingdialog.h b/src/settingdialog.h similarity index 100% rename from settingdialog.h rename to src/settingdialog.h diff --git a/settingdialog.ui b/src/settingdialog.ui similarity index 100% rename from settingdialog.ui rename to src/settingdialog.ui diff --git a/snooze.cpp b/src/snooze.cpp similarity index 100% rename from snooze.cpp rename to src/snooze.cpp diff --git a/snooze.h b/src/snooze.h similarity index 100% rename from snooze.h rename to src/snooze.h diff --git a/snooze.ui b/src/snooze.ui similarity index 97% rename from snooze.ui rename to src/snooze.ui index ebd2f9e..8565464 100644 --- a/snooze.ui +++ b/src/snooze.ui @@ -15,7 +15,7 @@ - :/new/icons/Clock.png:/new/icons/Clock.png + :/new/icons/clock.png:/new/icons/clock.png diff --git a/timer.cpp b/src/timer.cpp similarity index 100% rename from timer.cpp rename to src/timer.cpp diff --git a/timer.h b/src/timer.h similarity index 100% rename from timer.h rename to src/timer.h