diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mainwindow.cpp | 2 | ||||
-rw-r--r-- | src/rateapp.cpp | 1 | ||||
-rw-r--r-- | src/settingswidget.cpp | 6 | ||||
-rw-r--r-- | src/settingswidget.h | 2 | ||||
-rw-r--r-- | src/settingswidget.ui | 365 | ||||
-rw-r--r-- | src/webenginepage.cpp | 9 |
6 files changed, 204 insertions, 181 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 42047ea..e777486 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -55,7 +55,7 @@ MainWindow::MainWindow(QWidget *parent) updateWindowTheme(); - RateApp *rateApp = new RateApp(this, "snap://whatsie", 3, 5, 1000 * 30); + RateApp *rateApp = new RateApp(this, "snap://whatsie", 5, 5, 1000 * 30); rateApp->setWindowTitle(QApplication::applicationName()+" | "+tr("Rate Application")); rateApp->setVisible(false); rateApp->setWindowFlags(Qt::Dialog); diff --git a/src/rateapp.cpp b/src/rateapp.cpp index 03926e2..cd29c06 100644 --- a/src/rateapp.cpp +++ b/src/rateapp.cpp @@ -88,7 +88,6 @@ RateApp::~RateApp() delete ui; } - void RateApp::on_rateNowBtn_clicked() { QDesktopServices::openUrl(QUrl(app_rating_url)); diff --git a/src/settingswidget.cpp b/src/settingswidget.cpp index 1101c88..2807ab5 100644 --- a/src/settingswidget.cpp +++ b/src/settingswidget.cpp @@ -28,6 +28,7 @@ SettingsWidget::SettingsWidget(QWidget *parent, QString engineCachePath, QString ui->enableSpellCheck->setChecked(settings.value("sc_enabled",true).toBool()); ui->notificationTimeOutspinBox->setValue(settings.value("notificationTimeOut",9000).toInt()/1000); ui->notificationCombo->setCurrentIndex(settings.value("notificationCombo",1).toInt()); + ui->useNativeFileDialog->setChecked(settings.value("useNativeFileDialog",true).toBool()); ui->automaticThemeCheckBox->blockSignals(true); bool automaticThemeSwitching = settings.value("automaticTheme",false).toBool(); @@ -413,3 +414,8 @@ void SettingsWidget::on_automaticThemeCheckBox_toggled(bool checked) updateAutomaticTheme(); } } + +void SettingsWidget::on_useNativeFileDialog_toggled(bool checked) +{ + settings.setValue("useNativeFileDialog",checked); +} diff --git a/src/settingswidget.h b/src/settingswidget.h index 300b7e3..a49eda8 100644 --- a/src/settingswidget.h +++ b/src/settingswidget.h @@ -86,6 +86,8 @@ private slots: void updateAutomaticTheme(); void themeSwitchTimerTimeout(); + void on_useNativeFileDialog_toggled(bool checked); + private: Ui::SettingsWidget *ui; QString engineCachePath,enginePersistentStoragePath; diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 0f400a3..3f7e2d4 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>512</width> - <height>613</height> + <height>644</height> </rect> </property> <property name="windowTitle"> @@ -109,81 +109,100 @@ background:transparent; <string>General settings</string> </property> <layout class="QGridLayout" name="gridLayout_4"> - <item row="9" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_8"> - <property name="topMargin"> - <number>0</number> - </property> + <item row="12" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QLabel" name="label_10"> + <widget class="QLabel" name="label_4"> <property name="text"> - <string>App permissions</string> + <string>User Agent</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="showPermissionsButton"> + <widget class="QLineEdit" name="userAgentLineEdit"/> + </item> + <item> + <widget class="QPushButton" name="setUserAgent"> <property name="text"> - <string> Show permissions</string> + <string> Set</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/categories/security.png</normaloff>:/icons/categories/security.png</iconset> + <normaloff>:/icons/categories/utilities.png</normaloff>:/icons/categories/utilities.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="defaultUserAgentButton"> + <property name="text"> + <string> Default</string> + </property> + <property name="icon"> + <iconset resource="icons.qrc"> + <normaloff>:/icons/refresh-line.png</normaloff>:/icons/refresh-line.png</iconset> </property> </widget> </item> </layout> </item> - <item row="0" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_11"> + <item row="8" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout"> <item> - <widget class="QLabel" name="label_16"> + <widget class="QLabel" name="label"> <property name="text"> - <string>Notification type</string> + <string>Close button action</string> </property> </widget> </item> <item> - <widget class="QComboBox" name="notificationCombo"> + <widget class="QComboBox" name="closeButtonActionComboBox"> <item> <property name="text"> - <string>Native notification</string> + <string>Minimize to tray</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/categories/featured.png</normaloff>:/icons/categories/featured.png</iconset> + <normaloff>:/icons/window-2-line.png</normaloff>:/icons/window-2-line.png</iconset> </property> </item> <item> <property name="text"> - <string>Customized notification</string> + <string>Quit Application</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/categories/devices-and-iot.png</normaloff>:/icons/categories/devices-and-iot.png</iconset> + <normaloff>:/icons/shut-down-line.png</normaloff>:/icons/shut-down-line.png</iconset> </property> </item> </widget> </item> - <item> - <widget class="QPushButton" name="tryNotification"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string> Try</string> - </property> - <property name="icon"> - <iconset resource="icons.qrc"> - <normaloff>:/icons/categories/science.png</normaloff>:/icons/categories/science.png</iconset> - </property> - </widget> - </item> </layout> </item> + <item row="4" column="0"> + <widget class="Line" name="line_2"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>1</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>1</height> + </size> + </property> + <property name="styleSheet"> + <string notr="true">background-color: rgba(63, 129, 216, 48);</string> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> <item row="2" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_5"> <item> @@ -230,100 +249,54 @@ background:transparent; </item> </layout> </item> - <item row="8" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item row="10" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_8"> + <property name="topMargin"> + <number>0</number> + </property> <item> - <widget class="QLabel" name="label_9"> + <widget class="QLabel" name="label_10"> <property name="text"> - <string>Global App shortcuts</string> + <string>App permissions</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="showShortcutsButton"> + <widget class="QPushButton" name="showPermissionsButton"> <property name="text"> - <string> Show shortcuts</string> + <string> Show permissions</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/share-forward-line.png</normaloff>:/icons/share-forward-line.png</iconset> + <normaloff>:/icons/categories/security.png</normaloff>:/icons/categories/security.png</iconset> </property> </widget> </item> </layout> </item> - <item row="1" column="0"> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="1"> - <widget class="Line" name="line_3"> - <property name="minimumSize"> - <size> - <width>1</width> - <height>0</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>1</width> - <height>16777215</height> - </size> - </property> - <property name="styleSheet"> - <string notr="true">background-color: rgba(63, 129, 216, 48);</string> - </property> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - </widget> - </item> - <item row="0" column="0"> - <widget class="QCheckBox" name="notificationCheckBox"> + <item row="9" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="label_9"> <property name="text"> - <string>Disable Notifications PopUp</string> + <string>Global App shortcuts</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QCheckBox" name="autoPlayMediaCheckBox"> + <item> + <widget class="QPushButton" name="showShortcutsButton"> <property name="text"> - <string>Disable Auto Playback of Media</string> + <string> Show shortcuts</string> </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="muteAudioCheckBox"> - <property name="text"> - <string>Mute Audio from Page</string> + <property name="icon"> + <iconset resource="icons.qrc"> + <normaloff>:/icons/share-forward-line.png</normaloff>:/icons/share-forward-line.png</iconset> </property> </widget> </item> - <item row="0" column="2"> - <layout class="QHBoxLayout" name="horizontalLayout_9"> - <item> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>PopUp timeout</string> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="notificationTimeOutspinBox"> - <property name="suffix"> - <string> Secs</string> - </property> - <property name="minimum"> - <number>2</number> - </property> - <property name="maximum"> - <number>20</number> - </property> - </widget> - </item> - </layout> - </item> </layout> </item> - <item row="4" column="0"> + <item row="5" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_4"> <property name="topMargin"> <number>0</number> @@ -347,43 +320,7 @@ background:transparent; </item> </layout> </item> - <item row="11" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <item> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>User Agent</string> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="userAgentLineEdit"/> - </item> - <item> - <widget class="QPushButton" name="setUserAgent"> - <property name="text"> - <string> Set</string> - </property> - <property name="icon"> - <iconset resource="icons.qrc"> - <normaloff>:/icons/categories/utilities.png</normaloff>:/icons/categories/utilities.png</iconset> - </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="defaultUserAgentButton"> - <property name="text"> - <string> Default</string> - </property> - <property name="icon"> - <iconset resource="icons.qrc"> - <normaloff>:/icons/refresh-line.png</normaloff>:/icons/refresh-line.png</iconset> - </property> - </widget> - </item> - </layout> - </item> - <item row="6" column="0"> + <item row="7" column="0"> <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QLabel" name="label_2"> @@ -432,65 +369,128 @@ background:transparent; </item> </layout> </item> - <item row="3" column="0"> - <widget class="Line" name="line_2"> - <property name="minimumSize"> - <size> - <width>0</width> - <height>1</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>1</height> - </size> - </property> - <property name="styleSheet"> - <string notr="true">background-color: rgba(63, 129, 216, 48);</string> - </property> - <property name="frameShadow"> - <enum>QFrame::Raised</enum> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - </widget> - </item> - <item row="7" column="0"> - <layout class="QHBoxLayout" name="horizontalLayout"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_11"> <item> - <widget class="QLabel" name="label"> + <widget class="QLabel" name="label_16"> <property name="text"> - <string>Close button action</string> + <string>Notification type</string> </property> </widget> </item> <item> - <widget class="QComboBox" name="closeButtonActionComboBox"> + <widget class="QComboBox" name="notificationCombo"> <item> <property name="text"> - <string>Minimize to tray</string> + <string>Native notification</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/window-2-line.png</normaloff>:/icons/window-2-line.png</iconset> + <normaloff>:/icons/categories/featured.png</normaloff>:/icons/categories/featured.png</iconset> </property> </item> <item> <property name="text"> - <string>Quit Application</string> + <string>Customized notification</string> </property> <property name="icon"> <iconset resource="icons.qrc"> - <normaloff>:/icons/shut-down-line.png</normaloff>:/icons/shut-down-line.png</iconset> + <normaloff>:/icons/categories/devices-and-iot.png</normaloff>:/icons/categories/devices-and-iot.png</iconset> </property> </item> </widget> </item> + <item> + <widget class="QPushButton" name="tryNotification"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string> Try</string> + </property> + <property name="icon"> + <iconset resource="icons.qrc"> + <normaloff>:/icons/categories/science.png</normaloff>:/icons/categories/science.png</iconset> + </property> + </widget> + </item> </layout> </item> - <item row="10" column="0"> + <item row="1" column="0"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="1"> + <widget class="Line" name="line_3"> + <property name="minimumSize"> + <size> + <width>1</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>1</width> + <height>16777215</height> + </size> + </property> + <property name="styleSheet"> + <string notr="true">background-color: rgba(63, 129, 216, 48);</string> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QCheckBox" name="notificationCheckBox"> + <property name="text"> + <string>Disable Notifications PopUp</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QCheckBox" name="autoPlayMediaCheckBox"> + <property name="text"> + <string>Disable Auto Playback of Media</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QCheckBox" name="muteAudioCheckBox"> + <property name="text"> + <string>Mute Audio from Page</string> + </property> + </widget> + </item> + <item row="0" column="2"> + <layout class="QHBoxLayout" name="horizontalLayout_9"> + <item> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>PopUp timeout</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="notificationTimeOutspinBox"> + <property name="suffix"> + <string> Secs</string> + </property> + <property name="minimum"> + <number>2</number> + </property> + <property name="maximum"> + <number>20</number> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item row="11" column="0"> <widget class="Line" name="line_4"> <property name="minimumSize"> <size> @@ -515,6 +515,17 @@ background:transparent; </property> </widget> </item> + <item row="3" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout_10"> + <item> + <widget class="QCheckBox" name="useNativeFileDialog"> + <property name="text"> + <string>Use Native File Dialog</string> + </property> + </widget> + </item> + </layout> + </item> </layout> </widget> </item> diff --git a/src/webenginepage.cpp b/src/webenginepage.cpp index bdb6ccb..9e34a61 100644 --- a/src/webenginepage.cpp +++ b/src/webenginepage.cpp @@ -123,7 +123,7 @@ void WebEnginePage::handleLoadFinished(bool ok) void WebEnginePage::fullScreenRequestedByPage(QWebEngineFullScreenRequest request) { - qDebug()<<"Fullscreen"; + //qDebug()<<"Fullscreen"; request.accept(); } @@ -138,8 +138,13 @@ QStringList WebEnginePage::chooseFiles(QWebEnginePage::FileSelectionMode mode, c } QFileDialog* dialog = new QFileDialog(); + dialog->setAttribute(Qt::WA_DeleteOnClose,true); dialog->setFileMode(dialogMode); - dialog->setOption(QFileDialog::DontUseNativeDialog,settings.value("useNativeFileDialog",true).toBool()); + if(settings.value("useNativeFileDialog",true).toBool() == false){ + dialog->setOption(QFileDialog::DontUseNativeDialog,true); + }else{ + dialog->setOption(QFileDialog::DontUseNativeDialog,false); + } QStringList mimeFilters = acceptedMimeTypes; mimeFilters.append("application/octet-stream"); // to show All files(*) |