Browse Source

version year bump, removed window select on single screens

gwillz 5 years ago
parent
commit
cc1cf049a7
4 changed files with 13 additions and 6 deletions
  1. 0 1
      dialogs.cpp
  2. 3 0
      dialogs.h
  3. 6 1
      slidewindow.cpp
  4. 4 4
      version.h

+ 0 - 1
dialogs.cpp

@@ -37,7 +37,6 @@ LoginDialog::LoginDialog(FbApi *fb, QWidget *parent)
     
     //permission dialog
     perms = new PermissionDialog(this);
-    perms->show();
     
     userEdit->setText(fb->user());
     hdEdit->setChecked(fb->highRes);

+ 3 - 0
dialogs.h

@@ -96,6 +96,9 @@ class ScreenDialog
     
     public:
         explicit ScreenDialog(QWidget *parent = 0);
+        int numScreens() {
+            return desktop.screenCount();
+        }
         
     public slots:
         void okClicked();

+ 6 - 1
slidewindow.cpp

@@ -25,7 +25,12 @@ void SlideWindow::setupScreens() {
     ScreenDialog *diag = new ScreenDialog(this);
     connect(diag, SIGNAL(accepted()), this, SLOT(setupLogin()));
     connect(diag, SIGNAL(rejected()), qApp, SLOT(quit()));
-    diag->show();
+    
+    if (diag->numScreens() > 1) {
+        diag->show();
+    } else {
+        setupLogin();
+    }
 }
 
 void SlideWindow::setupLogin() {

+ 4 - 4
version.h

@@ -1,16 +1,16 @@
 #ifndef VERSION_H
 #define VERSION_H
 
-#define VER_FILEVERSION             1,5,1,4
-#define VER_FILEVERSION_STR         "1.5.1.4\0"
+#define VER_FILEVERSION             1,5,2,5
+#define VER_FILEVERSION_STR         "1.5.2.5\0"
 
-#define VER_PRODUCTVERSION          1,5,1,4
+#define VER_PRODUCTVERSION          1,5,2,5
 #define VER_PRODUCTVERSION_STR      "1.5\0"
 
 #define VER_COMPANYNAME_STR         "GwillzCorp"
 #define VER_FILEDESCRIPTION_STR     "PhotoBunny"
 #define VER_INTERNALNAME_STR        "photobunny"
-#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) 2014 Gwilyn Saunders"
+#define VER_LEGALCOPYRIGHT_STR      "Copyright (c) 2015 Gwilyn Saunders"
 #define VER_LEGALTRADEMARKS1_STR    "Licensed under GPL 3.0"
 #define VER_LEGALTRADEMARKS2_STR    "All Rights Reserved"
 #define VER_ORIGINALFILENAME_STR    "photobunny.exe"