Merge branch 'release/0.9.6'

leftytennis · Aug 5, 2016 · e5106d7 · e5106d7
2 parents 3390f5a + 2cc999e
commit e5106d7
Show file tree

Hide file tree

Showing 30 changed files with 90 additions and 80 deletions.
diff --git 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
@@ -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
diff --git a/InkjetPlumber.icns → src/InkjetPlumber.icns b/InkjetPlumber.icns → src/InkjetPlumber.icns
diff --git a/InkjetPlumber.plist → src/InkjetPlumber.plist b/InkjetPlumber.plist → src/InkjetPlumber.plist
@@ -19,7 +19,7 @@
     <key>CFBundleIdentifier</key>
     <string>org.threeputt.Inkjet Plumber</string>
     <key>CFBundleVersion</key>
-    <string>0.9.5</string>
+    <string>0.9.6</string>
     <key>NOTE</key>
     <string>This file was generated by Qt/QMake.</string>
 	<key>SUAutomaticallyUpdate</key>

diff --git a/InkjetPlumber.qrc → src/InkjetPlumber.qrc b/InkjetPlumber.qrc → src/InkjetPlumber.qrc
diff --git a/src/Sparkle b/src/Sparkle
diff --git a/aboutdialog.cpp → src/aboutdialog.cpp b/aboutdialog.cpp → src/aboutdialog.cpp
diff --git a/aboutdialog.h → src/aboutdialog.h b/aboutdialog.h → src/aboutdialog.h
diff --git a/aboutdialog.ui → src/aboutdialog.ui b/aboutdialog.ui → src/aboutdialog.ui
diff --git a/autoupdater.cpp → src/autoupdater.cpp b/autoupdater.cpp → src/autoupdater.cpp
diff --git a/autoupdater.h → src/autoupdater.h b/autoupdater.h → src/autoupdater.h
diff --git a/cocoainitializer.h → src/cocoainitializer.h b/cocoainitializer.h → src/cocoainitializer.h
diff --git a/cocoainitializer.mm → src/cocoainitializer.mm b/cocoainitializer.mm → src/cocoainitializer.mm
diff --git a/main.cpp → src/main.cpp b/main.cpp → src/main.cpp
diff --git a/maintenancejob.cpp → src/maintenancejob.cpp b/maintenancejob.cpp → src/maintenancejob.cpp
diff --git a/maintenancejob.h → src/maintenancejob.h b/maintenancejob.h → src/maintenancejob.h
diff --git a/mainwindow.cpp → src/mainwindow.cpp b/mainwindow.cpp → 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 → src/mainwindow.h b/mainwindow.h → src/mainwindow.h
diff --git a/mainwindow.ui → src/mainwindow.ui b/mainwindow.ui → src/mainwindow.ui
diff --git a/preferencesdialog.cpp → src/preferencesdialog.cpp b/preferencesdialog.cpp → src/preferencesdialog.cpp
diff --git a/preferencesdialog.h → src/preferencesdialog.h b/preferencesdialog.h → src/preferencesdialog.h
diff --git a/preferencesdialog.ui → src/preferencesdialog.ui b/preferencesdialog.ui → src/preferencesdialog.ui
diff --git a/resources/files/LaunchAgent.plist → src/resources/files/LaunchAgent.plist b/resources/files/LaunchAgent.plist → src/resources/files/LaunchAgent.plist
diff --git a/resources/files/PrintSelfTestPage.txt → src/resources/files/PrintSelfTestPage.txt b/resources/files/PrintSelfTestPage.txt → src/resources/files/PrintSelfTestPage.txt
diff --git a/resources/images/icon.png → src/resources/images/icon.png b/resources/images/icon.png → src/resources/images/icon.png
diff --git a/sparkleautoupdater.h → src/sparkleautoupdater.h b/sparkleautoupdater.h → src/sparkleautoupdater.h
diff --git a/sparkleautoupdater.mm → src/sparkleautoupdater.mm b/sparkleautoupdater.mm → src/sparkleautoupdater.mm
diff --git a/src/src.pro 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 → src/version.h b/version.h → 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