diff --git a/src/scripts/CMakeLists.txt b/src/scripts/CMakeLists.txt --- a/src/scripts/CMakeLists.txt +++ b/src/scripts/CMakeLists.txt @@ -11,4 +11,4 @@ install_python_script(hellopython) install_python_script(runaction) -install_python_script(MiddleClickLoader) +install_python_script(middleclickloader) diff --git a/src/scripts/MiddleClickLoader/Messages.sh b/src/scripts/middleclickloader/Messages.sh rename from src/scripts/MiddleClickLoader/Messages.sh rename to src/scripts/middleclickloader/Messages.sh diff --git a/src/scripts/MiddleClickLoader/__init__.py b/src/scripts/middleclickloader/__init__.py rename from src/scripts/MiddleClickLoader/__init__.py rename to src/scripts/middleclickloader/__init__.py --- a/src/scripts/MiddleClickLoader/__init__.py +++ b/src/scripts/middleclickloader/__init__.py @@ -18,7 +18,7 @@ import Falkon from PySide2 import QtCore -from MiddleClickLoader.mcl_handler import MCL_Handler +from middleclickloader.mcl_handler import MCL_Handler class MCL_Plugin(Falkon.PluginInterface, QtCore.QObject): diff --git a/src/scripts/MiddleClickLoader/mcl_handler.py b/src/scripts/middleclickloader/mcl_handler.py rename from src/scripts/MiddleClickLoader/mcl_handler.py rename to src/scripts/middleclickloader/mcl_handler.py --- a/src/scripts/MiddleClickLoader/mcl_handler.py +++ b/src/scripts/middleclickloader/mcl_handler.py @@ -19,8 +19,8 @@ import Falkon from PySide2 import QtCore, QtGui, QtWidgets -from MiddleClickLoader.mcl_loadmode import MCL_LoadMode -from MiddleClickLoader.mcl_settings import MCL_Settings +from middleclickloader.mcl_loadmode import MCL_LoadMode +from middleclickloader.mcl_settings import MCL_Settings class MCL_Handler(QtCore.QObject): diff --git a/src/scripts/MiddleClickLoader/mcl_loadmode.py b/src/scripts/middleclickloader/mcl_loadmode.py rename from src/scripts/MiddleClickLoader/mcl_loadmode.py rename to src/scripts/middleclickloader/mcl_loadmode.py diff --git a/src/scripts/MiddleClickLoader/mcl_settings.py b/src/scripts/middleclickloader/mcl_settings.py rename from src/scripts/MiddleClickLoader/mcl_settings.py rename to src/scripts/middleclickloader/mcl_settings.py --- a/src/scripts/MiddleClickLoader/mcl_settings.py +++ b/src/scripts/middleclickloader/mcl_settings.py @@ -18,8 +18,8 @@ import os from PySide2 import QtCore, QtWidgets, QtUiTools -from MiddleClickLoader.i18n import i18n -from MiddleClickLoader.mcl_loadmode import MCL_LoadMode +from middleclickloader.i18n import i18n +from middleclickloader.mcl_loadmode import MCL_LoadMode class MCL_Settings(QtWidgets.QDialog): @@ -40,14 +40,19 @@ layout.addWidget(self.ui) self.setLayout(layout) - self.ui.comboBox.addItem(i18n("New Tab"), MCL_LoadMode.NEW_TAB) - self.ui.comboBox.addItem(i18n("Current Tab"), MCL_LoadMode.CURRENT_TAB) - self.ui.comboBox.addItem(i18n("New Window"), MCL_LoadMode.NEW_WINDOW) + self.setWindowTitle(i18n("MiddleClickLoader Setting")) + self.ui.label_header.setText("

{}

".format(i18n("MiddleClickLoader"))) + self.ui.label_loadMode.setText(i18n("Open url in:")) + self.ui.onlyValidUrl.setText(i18n("Use only valid url")) + + self.ui.loadMode.addItem(i18n("New Tab"), MCL_LoadMode.NEW_TAB) + self.ui.loadMode.addItem(i18n("Current Tab"), MCL_LoadMode.CURRENT_TAB) + self.ui.loadMode.addItem(i18n("New Window"), MCL_LoadMode.NEW_WINDOW) settings = QtCore.QSettings(self.settingsFile, QtCore.QSettings.IniFormat) settings.beginGroup("MiddleClickLoader") - self.ui.comboBox.setCurrentIndex(int(settings.value("LoadMode", MCL_LoadMode.NEW_TAB))) - self.ui.checkBox.setChecked(bool(settings.value("OnlyValidUrl", True))) + self.ui.loadMode.setCurrentIndex(int(settings.value("LoadMode", MCL_LoadMode.NEW_TAB))) + self.ui.onlyValidUrl.setChecked(bool(settings.value("OnlyValidUrl", True))) settings.endGroup() self.ui.buttonBox.accepted.connect(self.accept) @@ -56,8 +61,8 @@ def accept(self): settings = QtCore.QSettings(self.settingsFile, QtCore.QSettings.IniFormat) settings.beginGroup("MiddleClickLoader") - settings.setValue("LoadMode", self.ui.comboBox.currentIndex()) - settings.setValue("OnlyValidUrl", self.ui.checkBox.isChecked()) + settings.setValue("LoadMode", self.ui.loadMode.currentIndex()) + settings.setValue("OnlyValidUrl", self.ui.onlyValidUrl.isChecked()) settings.endGroup() super().accept() diff --git a/src/scripts/MiddleClickLoader/mcl_settings.ui b/src/scripts/middleclickloader/mcl_settings.ui rename from src/scripts/MiddleClickLoader/mcl_settings.ui rename to src/scripts/middleclickloader/mcl_settings.ui --- a/src/scripts/MiddleClickLoader/mcl_settings.ui +++ b/src/scripts/middleclickloader/mcl_settings.ui @@ -30,9 +30,9 @@ - + - <h1>MiddleClickLoader</h1> + <h2>MiddleClickLoader</h2> @@ -54,9 +54,9 @@ - + - Open url at: + Open url in: @@ -74,12 +74,12 @@ - + - + Use only valid url diff --git a/src/scripts/MiddleClickLoader/metadata.desktop b/src/scripts/middleclickloader/metadata.desktop rename from src/scripts/MiddleClickLoader/metadata.desktop rename to src/scripts/middleclickloader/metadata.desktop