Changeset 999
- Timestamp:
- Apr 26, 2014, 2:40:47 PM (11 years ago)
- Location:
- Vago/trunk/Vago
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
Vago/trunk/Vago/Vago.pro
r998 r999 5 5 #------------------------------------------------- 6 6 7 QT += core gui7 QT += widgets 8 8 QT += network #network communication 9 9 QT += script #for json parse 10 QT += widgets11 10 12 11 INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib -
Vago/trunk/Vago/libs/unzip.h
r998 r999 35 35 #include <QtCore/QtGlobal> 36 36 37 #include < QtZlib/zlib.h>37 #include <zlib.h> 38 38 39 39 class QDir; -
Vago/trunk/Vago/libs/zip.h
r998 r999 34 34 #include <QtCore/QtGlobal> 35 35 36 #include < QtZlib/zlib.h>36 #include <zlib.h> 37 37 38 38 class QIODevice; -
Vago/trunk/Vago/main.cpp
r998 r999 3 3 #ifdef USING_VM_TABLET_WARNING_FIX 4 4 #include <qapplication.h> 5 void myMessageOutput(QtMsgType type, const char *msg);5 void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str); 6 6 #endif 7 7 … … 13 13 14 14 #ifdef USING_VM_TABLET_WARNING_FIX 15 qInstallM sgHandler(myMessageOutput);15 qInstallMessageHandler(myMessageOutput); 16 16 #endif 17 17 … … 25 25 26 26 #ifdef USING_VM_TABLET_WARNING_FIX 27 void myMessageOutput(QtMsgType type, const char *msg)27 void myMessageOutput(QtMsgType type, const QMessageLogContext &, const QString & str) 28 28 { 29 30 const char * msg = str.toStdString().c_str(); 31 29 32 switch (type) { 30 33 case QtWarningMsg: 31 if(QString(msg)=="Q CocoaView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message34 if(QString(msg)=="QNSView handleTabletEvent: This tablet device is unknown (received no proximity event for it). Discarding event."){ // ignore this message 32 35 return; 33 36 } -
Vago/trunk/Vago/mainwindow.cpp
r998 r999 79 79 } 80 80 #ifdef Q_OS_MAC 81 if(!this->vagoSettings->contains(" UseYesButtonClear")){82 this->vagoSettings->setValue(" UseYesButtonClear", false);81 if(!this->vagoSettings->contains("useYesAsDefaultWhenRemovingItems")){ 82 this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems", false); 83 83 iniChanged=true; 84 84 } … … 97 97 this->startedWindowHeight=this->vagoSettings->value("WindowHeight").toInt(); 98 98 #ifdef Q_OS_MAC 99 this->useYesAsDefault InClearButton=this->vagoSettings->value("UseYesButtonClear").toBool();99 this->useYesAsDefaultWhenRemovingItems=this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool(); 100 100 #endif 101 101 … … 1070 1070 1071 1071 #ifdef Q_OS_MAC 1072 if(this->useYesAsDefault InClearButton){1072 if(this->useYesAsDefaultWhenRemovingItems){ 1073 1073 defaultButton = QMessageBox::Yes; 1074 1074 } … … 1089 1089 1090 1090 void MainWindow::clearTableContents(DropTableWidget *myTable){ 1091 1092 QMessageBox::StandardButton defaultButton = QMessageBox::NoButton; // default button for clear asking question, only customizable in mac os 1093 1091 1094 if(myTable->rowCount()==0){ 1092 1095 Util::showPopUp("Nothing to clear."); … … 1094 1097 } 1095 1098 1096 if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?")){ 1099 #ifdef Q_OS_MAC 1100 if(this->useYesAsDefaultWhenRemovingItems){ 1101 defaultButton = QMessageBox::Yes; 1102 } 1103 else{ 1104 defaultButton = QMessageBox::No; 1105 } 1106 #endif 1107 1108 if(Util::showQuestionPopUp(this,"Are you sure you want to clear the content?",defaultButton)){ 1097 1109 myTable->clearContents(); 1098 1110 myTable->setRowCount(0); -
Vago/trunk/Vago/mainwindow.h
r998 r999 192 192 int startedWindowHeight; 193 193 #ifdef Q_OS_MAC 194 bool useYesAsDefault InClearButton;194 bool useYesAsDefaultWhenRemovingItems; 195 195 #endif 196 196 QLabel *itemsLoaded; -
Vago/trunk/Vago/preferences.cpp
r998 r999 18 18 ui->cbSeparate->setChecked(this->vagoSettings->value("SeparateInWorkspace").toBool()); 19 19 ui->cbVagoExit->setChecked(this->vagoSettings->value("ConfirmExit").toBool()); 20 #ifdef Q_OS_MAC 21 ui->cbUseYesAsDefaultWhenRemovingItems->setChecked(this->vagoSettings->value("useYesAsDefaultWhenRemovingItems").toBool()); 22 #endif 20 23 21 24 #ifdef Q_OS_WIN 22 ui->cb ClearButtonYes->hide(); // don't display this mac os only option in windows25 ui->cbUseYesAsDefaultWhenRemovingItems->hide(); // don't display this mac os only option in windows 23 26 #endif 24 27 … … 66 69 this->vagoSettings->setValue("ConfirmExit",ui->cbVagoExit->isChecked()); 67 70 #ifdef Q_OS_MAC 68 this->vagoSettings->setValue(" UseYesButtonClear",ui->cbClearButtonYes->isChecked());71 this->vagoSettings->setValue("useYesAsDefaultWhenRemovingItems",ui->cbUseYesAsDefaultWhenRemovingItems->isChecked()); 69 72 #endif 70 73 -
Vago/trunk/Vago/preferences.ui
r998 r999 8 8 <y>0</y> 9 9 <width>493</width> 10 <height>2 58</height>10 <height>291</height> 11 11 </rect> 12 12 </property> … … 140 140 </item> 141 141 <item> 142 <widget class="QCheckBox" name="cb ClearButtonYes">142 <widget class="QCheckBox" name="cbUseYesAsDefaultWhenRemovingItems"> 143 143 <property name="text"> 144 <string>Use Yes button as default for Clearitems</string>144 <string>Use Yes button as default when removing items</string> 145 145 </property> 146 146 </widget>
Note:
See TracChangeset
for help on using the changeset viewer.