Changeset 999 for Vago

Timestamp:

Apr 26, 2014, 2:40:47 PM (11 years ago)

Author:

s10k

Message:

Vago 0.9a mac specific changes

Location:

Vago/trunk/Vago

Files:

• Vago.pro (modified) (1 diff)
• libs/unzip.h (modified) (1 diff)
• libs/zip.h (modified) (1 diff)
• main.cpp (modified) (3 diffs)
• mainwindow.cpp (modified) (5 diffs)
• mainwindow.h (modified) (1 diff)
• preferences.cpp (modified) (2 diffs)
• preferences.ui (modified) (2 diffs)

Vago/trunk/Vago/Vago.pro

@@ -5 +5 @@
 #-------------------------------------------------
 
-QT       += core gui
+QT       += widgets
 QT       += network #network communication
 QT       += script #for json parse
-QT       += widgets
 
 INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib

Vago/trunk/Vago/libs/unzip.h

@@ -35 +35 @@
 #include <QtCore/QtGlobal>
 
-#include <QtZlib/zlib.h>
+#include <zlib.h>
 
 class QDir;

Vago/trunk/Vago/libs/zip.h

@@ -34 +34 @@
 #include <QtCore/QtGlobal>
 
-#include <QtZlib/zlib.h>
+#include <zlib.h>
 
 class QIODevice;

Vago/trunk/Vago/main.cpp

@@ -3 +3 @@
 #ifdef USING_VM_TABLET_WARNING_FIX
 #include <qapplication.h>
-void myMessageOutput(QtMsgType type, const char *msg);
+void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str);
 #endif
 
@@ -13 +13 @@
 
 #ifdef USING_VM_TABLET_WARNING_FIX
-    qInstallMsgHandler(myMessageOutput);
+    qInstallMessageHandler(myMessageOutput);
 #endif
 
@@ -25 +25 @@
 
 #ifdef USING_VM_TABLET_WARNING_FIX
-void myMessageOutput(QtMsgType type, const char *msg)
+void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str)
 {
+
+    const char * msg = str.toStdString().c_str();
+
     switch (type) {
     case QtWarningMsg:
-        if(QString(msg)=="QCocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
+        if(QString(msg)=="QNSView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message
             return;
         }

Vago/trunk/Vago/mainwindow.cpp

@@ -79 +79 @@
     }
 #ifdef Q_OS_MAC
-    if(!this->vagoSettings->contains("UseYesButtonClear")){
-        this->vagoSettings->setValue("UseYesButtonClear", false);
+    if(!this->vagoSettings->contains("useYesAsDefaultWhenRemovingItems")){
+        this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems", false);
         iniChanged=true;
     }
@@ -97 +97 @@
     this->startedWindowHeight=this->vagoSettings->value("WindowHeight").toInt();
 #ifdef Q_OS_MAC
-    this->useYesAsDefaultInClearButton=this->vagoSettings->value("UseYesButtonClear").toBool();
+    this->useYesAsDefaultWhenRemovingItems=this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool();
 #endif
 
@@ -1070 +1070 @@
 
 #ifdef Q_OS_MAC
-    if(this->useYesAsDefaultInClearButton){
+    if(this->useYesAsDefaultWhenRemovingItems){
         defaultButton = QMessageBox::Yes;
     }
@@ -1089 +1089 @@
 
 void MainWindow::clearTableContents(DropTableWidget *myTable){
+
+    QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os
+
     if(myTable->rowCount()==0){
         Util::showPopUp("Nothing to clear.");
@@ -1094 +1097 @@
     }
 
-    if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?")){
+#ifdef Q_OS_MAC
+    if(this->useYesAsDefaultWhenRemovingItems){
+        defaultButton = QMessageBox::Yes;
+    }
+    else{
+        defaultButton = QMessageBox::No;
+    }
+#endif
+
+    if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?",defaultButton)){
         myTable->clearContents();
         myTable->setRowCount(0);

Vago/trunk/Vago/mainwindow.h

@@ -192 +192 @@
     int startedWindowHeight;
 #ifdef Q_OS_MAC
-    bool useYesAsDefaultInClearButton;
+    bool useYesAsDefaultWhenRemovingItems;
 #endif
     QLabel *itemsLoaded;

Vago/trunk/Vago/preferences.cpp

@@ -18 +18 @@
     ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool());
     ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool());
+#ifdef Q_OS_MAC
+    ui->cbUseYesAsDefaultWhenRemovingItems->setChecked(this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool());
+#endif
 
 #ifdef Q_OS_WIN
-    ui->cbClearButtonYes->hide(); // don't display this mac os only option in windows
+    ui->cbUseYesAsDefaultWhenRemovingItems->hide(); // don't display this mac os only option in windows
 #endif
 
@@ -66 +69 @@
     this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked());
 #ifdef Q_OS_MAC
-    this->vagoSettings->setValue("UseYesButtonClear",ui->cbClearButtonYes->isChecked());
+    this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems",ui->cbUseYesAsDefaultWhenRemovingItems->isChecked());
 #endif
 

Vago/trunk/Vago/preferences.ui

@@ -8 +8 @@
     <y>0</y>
     <width>493</width>
-    <height>258</height>
+    <height>291</height>
    </rect>
   </property>
@@ -140 +140 @@
       </item>
       <item>
-       <widget class="QCheckBox" name="cbClearButtonYes">
+       <widget class="QCheckBox" name="cbUseYesAsDefaultWhenRemovingItems">
         <property name="text">
-         <string>Use Yes button as default for Clear items</string>
+         <string>Use Yes button as default when removing items</string>
         </property>
        </widget>