diff --git a/.gitmodules b/.gitmodules
index ce841c7..3185465 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "Sparkle"]
- path = Sparkle
- url = git@github.com:sparkle-project/Sparkle
+[submodule "src/Sparkle"]
+ path = src/Sparkle
+ url = https://github.com/sparkle-project/Sparkle.git
diff --git a/InkjetPlumber.pro b/InkjetPlumber.pro
index 56b7a6f..0ef53a2 100644
--- a/InkjetPlumber.pro
+++ b/InkjetPlumber.pro
@@ -1,75 +1,7 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2016-07-02T13:04:25
-#
-#-------------------------------------------------
-QT += core gui printsupport
+TEMPLATE = subdirs
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+CONFIG += ordered
-TARGET = InkjetPlumber
-TEMPLATE = app
-
-SOURCES += main.cpp\
- mainwindow.cpp \
- preferencesdialog.cpp \
- maintenancejob.cpp \
- autoupdater.cpp \
- aboutdialog.cpp
-
-HEADERS += mainwindow.h \
- version.h \
- preferencesdialog.h \
- maintenancejob.h \
- autoupdater.h \
- aboutdialog.h
-
-FORMS += mainwindow.ui \
- preferencesdialog.ui \
- aboutdialog.ui
-
-RESOURCES += \
- InkjetPlumber.qrc
-
-ICON = InkjetPlumber.icns
-
-CONFIG(debug, debug|release) {
- DESTDIR = build/debug
- DEFINES += INKJETPLUMBER_DEBUG
-} else {
- DESTDIR = build/release
- DEFINES += INKJETPLUMBER_RELEASE
-}
-
-OBJECTS_DIR = $${DESTDIR}/.generatedfiles
-MOC_DIR = $${DESTDIR}/.generatedfiles
-RCC_DIR = $${DESTDIR}/.generatedfiles
-UI_DIR = $${DESTDIR}/.generatedfiles
-
-mac {
- HEADERS += \
- cocoainitializer.h \
- sparkleautoupdater.h
- OBJECTIVE_SOURCES += \
- cocoainitializer.mm \
- sparkleautoUpdater.mm
- BUNDLE_DIR = $$quote($$DESTDIR/$${TARGET}.app)
- QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
- QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO
- QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO
- QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
- QMAKE_LFLAGS = -Wl,-rpath,@executable_path/../Frameworks
- QMAKE_POST_LINK += ditto -v \"$${PWD}/Sparkle/build/Release/Sparkle.framework/\" \"$${BUNDLE_DIR}/Contents/Frameworks/Sparkle.framework/\" 2>&1;
- QMAKE_POST_LINK += /Users/jefft/bin/codesign_app_bundle \"$${BUNDLE_DIR}\" 2>&1
- INCLUDEPATH += $$PWD/Sparkle/build/Release/Sparkle.framework/Headers/
- LIBS += -F$${PWD}/Sparkle/build/Release/
- LIBS += -framework Sparkle -framework AppKit
- QMAKE_INFO_PLIST = InkjetPlumber.plist
- plist.target = Info.plist
- plist.depends = InkjetPlumber.plist "$${DESTDIR}/$${TARGET}.app/Contents/Info.plist"
- plist.commands = $(DEL_FILE) \"$${DESTDIR}/$${TARGET}.app/Contents/Info.plist\" $$escape_expand(\n\t) \
- $(COPY_FILE) InkjetPlumber.plist \"$${DESTDIR}/$${TARGET}.app/Contents/Info.plist\"
- QMAKE_EXTRA_TARGETS = plist
- PRE_TARGETDEPS += $$plist.target
-}
+SUBDIRS = \
+ src
diff --git a/Sparkle b/Sparkle
deleted file mode 160000
index 092feba..0000000
--- a/Sparkle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 092feba9f9bcc7dd2fecabd593e7e50d0e3d1ca6
diff --git a/InkjetPlumber.icns b/src/InkjetPlumber.icns
similarity index 100%
rename from InkjetPlumber.icns
rename to src/InkjetPlumber.icns
diff --git a/InkjetPlumber.plist b/src/InkjetPlumber.plist
similarity index 98%
rename from InkjetPlumber.plist
rename to src/InkjetPlumber.plist
index e98bb8c..c108324 100644
--- a/InkjetPlumber.plist
+++ b/src/InkjetPlumber.plist
@@ -19,7 +19,7 @@
CFBundleIdentifier
org.threeputt.Inkjet Plumber
CFBundleVersion
- 0.9.5
+ 0.9.6
NOTE
This file was generated by Qt/QMake.
SUAutomaticallyUpdate
diff --git a/InkjetPlumber.qrc b/src/InkjetPlumber.qrc
similarity index 100%
rename from InkjetPlumber.qrc
rename to src/InkjetPlumber.qrc
diff --git a/src/Sparkle b/src/Sparkle
new file mode 160000
index 0000000..43e96f7
--- /dev/null
+++ b/src/Sparkle
@@ -0,0 +1 @@
+Subproject commit 43e96f7ee8379e5df929c96400c6b9bc85dc615b
diff --git a/aboutdialog.cpp b/src/aboutdialog.cpp
similarity index 100%
rename from aboutdialog.cpp
rename to src/aboutdialog.cpp
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 100%
rename from aboutdialog.ui
rename to src/aboutdialog.ui
diff --git a/autoupdater.cpp b/src/autoupdater.cpp
similarity index 100%
rename from autoupdater.cpp
rename to src/autoupdater.cpp
diff --git a/autoupdater.h b/src/autoupdater.h
similarity index 100%
rename from autoupdater.h
rename to src/autoupdater.h
diff --git a/cocoainitializer.h b/src/cocoainitializer.h
similarity index 100%
rename from cocoainitializer.h
rename to src/cocoainitializer.h
diff --git a/cocoainitializer.mm b/src/cocoainitializer.mm
similarity index 100%
rename from cocoainitializer.mm
rename to src/cocoainitializer.mm
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/maintenancejob.cpp b/src/maintenancejob.cpp
similarity index 100%
rename from maintenancejob.cpp
rename to src/maintenancejob.cpp
diff --git a/maintenancejob.h b/src/maintenancejob.h
similarity index 100%
rename from maintenancejob.h
rename to src/maintenancejob.h
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
similarity index 99%
rename from mainwindow.cpp
rename to src/mainwindow.cpp
index 7ab2206..363c49f 100644
--- a/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -148,7 +148,9 @@ MainWindow::MainWindow(QWidget* parent)
connect(tray_action_quit, &QAction::triggered, this, &MainWindow::close);
connect(tray_menu_, &QMenu::aboutToShow, this, &MainWindow::about_to_show_tray_menu);
- tray_.setIcon(QIcon(":/icons/InkjetPlumber.icns"));
+ QIcon icon(":/icons/InkjetPlumber.icns");
+ icon.setIsMask(true);
+ tray_.setIcon(icon);
tray_.setContextMenu(tray_menu_);
tray_.show();
@@ -852,9 +854,10 @@ void MainWindow::maint_job_updated(MaintenanceJob* job, bool save)
if (!maint_job_map_.contains(job->printer_name))
{
maint_job_map_.insert(job->printer_name, job);
- show_printer_info(job->printer_name);
}
+ show_printer_info(job->printer_name);
+
if (save)
write_printer_settings(job->printer_name);
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 100%
rename from mainwindow.ui
rename to src/mainwindow.ui
diff --git a/preferencesdialog.cpp b/src/preferencesdialog.cpp
similarity index 100%
rename from preferencesdialog.cpp
rename to src/preferencesdialog.cpp
diff --git a/preferencesdialog.h b/src/preferencesdialog.h
similarity index 100%
rename from preferencesdialog.h
rename to src/preferencesdialog.h
diff --git a/preferencesdialog.ui b/src/preferencesdialog.ui
similarity index 100%
rename from preferencesdialog.ui
rename to src/preferencesdialog.ui
diff --git a/resources/files/LaunchAgent.plist b/src/resources/files/LaunchAgent.plist
similarity index 100%
rename from resources/files/LaunchAgent.plist
rename to src/resources/files/LaunchAgent.plist
diff --git a/resources/files/PrintSelfTestPage.txt b/src/resources/files/PrintSelfTestPage.txt
similarity index 100%
rename from resources/files/PrintSelfTestPage.txt
rename to src/resources/files/PrintSelfTestPage.txt
diff --git a/resources/images/icon.png b/src/resources/images/icon.png
similarity index 100%
rename from resources/images/icon.png
rename to src/resources/images/icon.png
diff --git a/sparkleautoupdater.h b/src/sparkleautoupdater.h
similarity index 100%
rename from sparkleautoupdater.h
rename to src/sparkleautoupdater.h
diff --git a/sparkleautoupdater.mm b/src/sparkleautoupdater.mm
similarity index 100%
rename from sparkleautoupdater.mm
rename to src/sparkleautoupdater.mm
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..56b7a6f
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,75 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2016-07-02T13:04:25
+#
+#-------------------------------------------------
+
+QT += core gui printsupport
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+TARGET = InkjetPlumber
+TEMPLATE = app
+
+SOURCES += main.cpp\
+ mainwindow.cpp \
+ preferencesdialog.cpp \
+ maintenancejob.cpp \
+ autoupdater.cpp \
+ aboutdialog.cpp
+
+HEADERS += mainwindow.h \
+ version.h \
+ preferencesdialog.h \
+ maintenancejob.h \
+ autoupdater.h \
+ aboutdialog.h
+
+FORMS += mainwindow.ui \
+ preferencesdialog.ui \
+ aboutdialog.ui
+
+RESOURCES += \
+ InkjetPlumber.qrc
+
+ICON = InkjetPlumber.icns
+
+CONFIG(debug, debug|release) {
+ DESTDIR = build/debug
+ DEFINES += INKJETPLUMBER_DEBUG
+} else {
+ DESTDIR = build/release
+ DEFINES += INKJETPLUMBER_RELEASE
+}
+
+OBJECTS_DIR = $${DESTDIR}/.generatedfiles
+MOC_DIR = $${DESTDIR}/.generatedfiles
+RCC_DIR = $${DESTDIR}/.generatedfiles
+UI_DIR = $${DESTDIR}/.generatedfiles
+
+mac {
+ HEADERS += \
+ cocoainitializer.h \
+ sparkleautoupdater.h
+ OBJECTIVE_SOURCES += \
+ cocoainitializer.mm \
+ sparkleautoUpdater.mm
+ BUNDLE_DIR = $$quote($$DESTDIR/$${TARGET}.app)
+ QMAKE_CFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
+ QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO
+ QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO
+ QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
+ QMAKE_LFLAGS = -Wl,-rpath,@executable_path/../Frameworks
+ QMAKE_POST_LINK += ditto -v \"$${PWD}/Sparkle/build/Release/Sparkle.framework/\" \"$${BUNDLE_DIR}/Contents/Frameworks/Sparkle.framework/\" 2>&1;
+ QMAKE_POST_LINK += /Users/jefft/bin/codesign_app_bundle \"$${BUNDLE_DIR}\" 2>&1
+ INCLUDEPATH += $$PWD/Sparkle/build/Release/Sparkle.framework/Headers/
+ LIBS += -F$${PWD}/Sparkle/build/Release/
+ LIBS += -framework Sparkle -framework AppKit
+ QMAKE_INFO_PLIST = InkjetPlumber.plist
+ plist.target = Info.plist
+ plist.depends = InkjetPlumber.plist "$${DESTDIR}/$${TARGET}.app/Contents/Info.plist"
+ plist.commands = $(DEL_FILE) \"$${DESTDIR}/$${TARGET}.app/Contents/Info.plist\" $$escape_expand(\n\t) \
+ $(COPY_FILE) InkjetPlumber.plist \"$${DESTDIR}/$${TARGET}.app/Contents/Info.plist\"
+ QMAKE_EXTRA_TARGETS = plist
+ PRE_TARGETDEPS += $$plist.target
+}
diff --git a/version.h b/src/version.h
similarity index 95%
rename from version.h
rename to src/version.h
index fe4ccf3..3375cbd 100644
--- a/version.h
+++ b/src/version.h
@@ -20,6 +20,6 @@
#ifndef VERSION_H
#define VERSION_H
-#define INKJETPLUMBER_VERSION "0.9.5"
+#define INKJETPLUMBER_VERSION "0.9.6"
#endif // VERSION_H