arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

* end work on #68

Browse Source 
* create special class for configuration
* update clion settings
This commit is contained in:
arcan1s 2015-10-17 00:06:32 +03:00
parent 0e1b101703
commit 8645260f99
32 changed files with 955 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/.idea/dictionaries/arcanis.xml generated Normal file
View File

@ -0,0 +1,3 @@
<component name="ProjectDictionaryState">
<dictionary name="arcanis" />
</component>

51
sources/.idea/misc.xml generated
View File

@ -1,6 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" /> <component name="CMakeWorkspace" IGNORE_OUTSIDE_FILES="true" PROJECT_DIR="$PROJECT_DIR$" />
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>C/C++</id>
</State>
<State>
<id>Data flow analysisC/C++</id>
</State>
<State>
<id>Declaration orderC/C++</id>
</State>
<State>
<id>FunctionsC/C++</id>
</State>
<State>
<id>GeneralC/C++</id>
</State>
<State>
<id>Type checksC/C++</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Internationalization issues</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Remove" />
@ -12,4 +46,19 @@
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" /> <component name="ProjectRootManager" version="2" />
<component name="masterDetails">
<states>
<state key="ScopeChooserConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project> </project>

53
sources/.idea/sources.iml generated
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module type="CPP_MODULE" version="4"> <module type="CPP_MODULE" version="4">
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/awesome-widget/plugin/awplugin_automoc.cpp"> <content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesome-widget/plugin/awplugin_automoc.cpp">
<sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/awesome-widget/plugin/awplugin_automoc.cpp" isTestSource="false" /> <sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesome-widget/plugin/awplugin_automoc.cpp" isTestSource="false" />
</content> </content>
<content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/awesomewidgets/awesomewidgets_automoc.cpp"> <content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesomewidgets/awesomewidgets_automoc.cpp">
<sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/awesomewidgets/awesomewidgets_automoc.cpp" isTestSource="false" /> <sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesomewidgets/awesomewidgets_automoc.cpp" isTestSource="false" />
</content> </content>
<content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/desktop-panel/plugin/dpplugin_automoc.cpp"> <content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/desktop-panel/plugin/dpplugin_automoc.cpp">
<sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/desktop-panel/plugin/dpplugin_automoc.cpp" isTestSource="false" /> <sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/desktop-panel/plugin/dpplugin_automoc.cpp" isTestSource="false" />
</content> </content>
<content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/extsysmon/__/3rdparty/task/moc_task.cpp"> <content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/__/3rdparty/task/moc_task.cpp">
<sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/extsysmon/__/3rdparty/task/moc_task.cpp" isTestSource="false" /> <sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/__/3rdparty/task/moc_task.cpp" isTestSource="false" />
</content> </content>
<content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/extsysmon/plasma_dataengine_extsysmon_automoc.cpp"> <content url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/plasma_dataengine_extsysmon_automoc.cpp">
<sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug/extsysmon/plasma_dataengine_extsysmon_automoc.cpp" isTestSource="false" /> <sourceFolder url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/plasma_dataengine_extsysmon_automoc.cpp" isTestSource="false" />
</content> </content>
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/3rdparty/fontdialog/fontdialog.cpp" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/3rdparty/fontdialog/fontdialog.cpp" isTestSource="false" />
@ -31,6 +31,8 @@
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/CMakeLists.txt" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/CMakeLists.txt" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awactions.cpp" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awactions.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awactions.h" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awactions.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awconfighelper.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awconfighelper.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataaggregator.cpp" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataaggregator.cpp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataaggregator.h" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataaggregator.h" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataengineaggregator.cpp" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/awesome-widget/plugin/awdataengineaggregator.cpp" isTestSource="false" />
@ -115,5 +117,36 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="Header Search Paths">
<CLASSES>
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/MinSizeRel" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/RelWithDebInfo" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release" />
<root url="file:///usr/include" />
<root url="file:///usr/lib/clang/3.7.0/include" />
<root url="file:///usr/lib/qt/mkspecs/linux-g++" />
<root url="file:///usr/local/include" />
</CLASSES>
<SOURCES>
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Debug" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/MinSizeRel" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/RelWithDebInfo" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release" />
<root url="file:///usr/include" />
<root url="file:///usr/lib/clang/3.7.0/include" />
<root url="file:///usr/lib/qt/mkspecs/linux-g++" />
<root url="file:///usr/local/include" />
</SOURCES>
<excluded>
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/desktop-panel/plugin/dpplugin_automoc.cpp" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesomewidgets/awesomewidgets_automoc.cpp" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/plasma_dataengine_extsysmon_automoc.cpp" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/awesome-widget/plugin/awplugin_automoc.cpp" />
<root url="file://$USER_HOME$/.clion11/system/cmake/generated/78749160/78749160/Release/extsysmon/__/3rdparty/task/moc_task.cpp" />
</excluded>
</library>
</orderEntry>
</component> </component>
</module> </module>

4
sources/.idea/vcs.xml generated
View File

@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$USER_HOME$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/.." vcs="Git" /> <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
<mapping directory="$PROJECT_DIR$/3rdparty/fontdialog" vcs="Git" />
<mapping directory="$PROJECT_DIR$/3rdparty/task" vcs="Git" />
<mapping directory="$PROJECT_DIR$/3rdparty/tasks" vcs="Git" />
</component> </component>
</project> </project>

265
sources/.idea/workspace.xml generated
View File

@ -14,13 +14,47 @@
<config projectName="awesomewidgets" targetName="aw_pofiles" /> <config projectName="awesomewidgets" targetName="aw_pofiles" />
</generated> </generated>
</component> </component>
<component name="CMakeSettings" AUTO_RELOAD="false" GENERATION_PASS_SYSTEM_ENVIRONMENT="true"> <component name="CMakeSettings" AUTO_RELOAD="false" GENERATION_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DBUILD_FUTURE=ON" GENERATION_PASS_SYSTEM_ENVIRONMENT="true" BUILD_OUTPUT_DIR="../build" ADDITIONAL_BUILD_OPTIONS="-j2">
<ADDITIONAL_GENERATION_ENVIRONMENT> <ADDITIONAL_GENERATION_ENVIRONMENT>
<envs /> <envs />
</ADDITIONAL_GENERATION_ENVIRONMENT> </ADDITIONAL_GENERATION_ENVIRONMENT>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0d97362a-408a-4c06-bd78-89983a3d619c" name="Default" comment="" /> <list default="true" id="2abf8d0d-47d8-4127-8499-2d7068a74152" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../CHANGELOG-RU" afterPath="$PROJECT_DIR$/../CHANGELOG-RU" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../CHANGELOG" afterPath="$PROJECT_DIR$/../CHANGELOG" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/../packages/PKGBUILD" afterPath="$PROJECT_DIR$/../packages/PKGBUILD" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/about.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/about.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/advanced.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/advanced.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/appearance.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/appearance.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/plugin/awactions.cpp" afterPath="$PROJECT_DIR$/awesome-widget/plugin/awactions.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/plugin/awactions.h" afterPath="$PROJECT_DIR$/awesome-widget/plugin/awactions.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/plugin/awesomewidget.cpp" afterPath="$PROJECT_DIR$/awesome-widget/plugin/awesomewidget.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.kdev4/awesomewidgets.kdev4" afterPath="$PROJECT_DIR$/.kdev4/awesomewidgets.kdev4" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/batterysource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/batterysource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/dataengine.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/dataengine.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/desktop-panel/plugin/dpadds.cpp" afterPath="$PROJECT_DIR$/desktop-panel/plugin/dpadds.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/desktop-panel/plugin/dpadds.h" afterPath="$PROJECT_DIR$/desktop-panel/plugin/dpadds.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/extsysmon.cpp" afterPath="$PROJECT_DIR$/extsysmon/extsysmon.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesomewidgets/extupgrade.cpp" afterPath="$PROJECT_DIR$/awesomewidgets/extupgrade.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesomewidgets/extweather.cpp" afterPath="$PROJECT_DIR$/awesomewidgets/extweather.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/gpuloadsource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/gpuloadsource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/gputempsource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/gputempsource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/hddtempsource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/hddtempsource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/loadsource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/loadsource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/main.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/main.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/networksource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/networksource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/playersource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/playersource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/processessource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/processessource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/quotessource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/quotessource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sources.iml" afterPath="$PROJECT_DIR$/.idea/sources.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/tooltip.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/tooltip.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/extsysmon/sources/weathersource.cpp" afterPath="$PROJECT_DIR$/extsysmon/sources/weathersource.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/awesome-widget/package/contents/ui/widget.qml" afterPath="$PROJECT_DIR$/awesome-widget/package/contents/ui/widget.qml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
<ignored path="sources.iws" /> <ignored path="sources.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -40,21 +74,35 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="awactions.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="awconfighelper.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awactions.cpp"> <entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="143" column="33" selection-start-line="143" selection-start-column="33" selection-end-line="143" selection-end-column="33" />
<folding /> <folding>
<element signature="e#1234#1261#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="awactions.h" pinned="false" current-in-tab="true"> <file leaf-file-name="awconfighelper.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awactions.h"> <entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6508951"> <state vertical-scroll-proportion="0.0">
<caret line="41" column="76" selection-start-line="41" selection-start-column="76" selection-end-line="41" selection-end-column="76" /> <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding>
<element signature="e#1286#1304#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="advanced.qml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/awesome-widget/package/contents/ui/advanced.qml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="8.986733">
<caret line="391" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="402" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -62,10 +110,16 @@
</file> </file>
</leaf> </leaf>
</component> </component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/awesome-widget/plugin/awactions.h" /> <option value="$PROJECT_DIR$/awesome-widget/plugin/awdataaggregator.cpp" />
<option value="$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.h" />
<option value="$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.cpp" />
<option value="$PROJECT_DIR$/awesome-widget/package/contents/ui/advanced.qml" />
</list> </list>
</option> </option>
</component> </component>
@ -77,10 +131,10 @@
<order /> <order />
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="1920" /> <option name="x" value="1280" />
<option name="y" value="23" /> <option name="y" value="21" />
<option name="width" value="1600" /> <option name="width" value="1366" />
<option name="height" value="877" /> <option name="height" value="747" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true"> <component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
@ -89,7 +143,7 @@
<OptionsSetting value="true" id="Update" /> <OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" /> <OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" /> <OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="1" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
@ -137,6 +191,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$MyProjectTreeStructure$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="awesomewidgets" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="sources" /> <option name="myItemId" value="sources" />
@ -177,20 +249,101 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$MyProjectTreeStructure$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="awesome-widget" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="package" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$MyProjectTreeStructure$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="awesome-widget" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="package" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="contents" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="ui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.jetbrains.cidr.projectView.CidrFilesViewHelper$MyProjectTreeStructure$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sources" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="awesome-widget" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="package" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="contents" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../.." />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
<property name="FullScreen" value="false" /> <property name="restartRequiresConfirmation" value="true" />
</component> </component>
<component name="RunManager" selected="Application.Build All"> <component name="RunManager" selected="Application.Release">
<configuration default="true" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS="FALSE" PROJECT_NAME="awesomewidgets" TARGET_NAME="uninstall" CONFIG_NAME="Debug"> <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS="FALSE" PROJECT_NAME="awesomewidgets" TARGET_NAME="uninstall" CONFIG_NAME="Debug">
<envs /> <envs />
<method /> <method />
</configuration> </configuration>
<configuration default="false" name="Build All" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS="FALSE" CONFIG_NAME="Debug" EXPLICIT_BUILD_TARGET_NAME="all"> <configuration default="false" name="Release" type="CMakeRunConfiguration" factoryName="Application" WORKING_DIR="" PASS_PARENT_ENVS="FALSE" CONFIG_NAME="Release" EXPLICIT_BUILD_TARGET_NAME="all">
<envs /> <envs />
<method /> <method />
</configuration> </configuration>
@ -235,7 +388,7 @@
<method /> <method />
</configuration> </configuration>
<list size="11"> <list size="11">
<item index="0" class="java.lang.String" itemvalue="Application.Build All" /> <item index="0" class="java.lang.String" itemvalue="Application.Release" />
<item index="1" class="java.lang.String" itemvalue="Application.uninstall" /> <item index="1" class="java.lang.String" itemvalue="Application.uninstall" />
<item index="2" class="java.lang.String" itemvalue="Application.awplugin" /> <item index="2" class="java.lang.String" itemvalue="Application.awplugin" />
<item index="3" class="java.lang.String" itemvalue="Application.awplugin_automoc" /> <item index="3" class="java.lang.String" itemvalue="Application.awplugin_automoc" />
@ -254,34 +407,34 @@
</component> </component>
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="0d97362a-408a-4c06-bd78-89983a3d619c" name="Default" comment="" /> <changelist id="2abf8d0d-47d8-4127-8499-2d7068a74152" name="Default" comment="" />
<created>1444961890223</created> <created>1445013689481</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1444961890223</updated> <updated>1445013689481</updated>
</task> </task>
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1920" y="23" width="1600" height="877" extended-state="6" /> <frame x="1280" y="21" width="1366" height="747" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24981412" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" sideWeight="0.4944238" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32880098" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" sideWeight="0.5055762" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
<component name="Vcs.Log.UiProperties"> <component name="Vcs.Log.UiProperties">
@ -302,13 +455,39 @@
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt"> <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.18286446"> <state vertical-scroll-proportion="0.0">
<caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awkeys.cpp"> <entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awdataaggregator.h">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.74242425">
<caret line="21" column="15" selection-start-line="21" selection-start-column="15" selection-end-line="21" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awdataaggregator.cpp">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.3466003">
<caret line="68" column="31" selection-start-line="68" selection-start-column="31" selection-end-line="68" selection-end-column="31" />
<folding>
<element signature="e#1234#1263#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/awesomewidgets/extscript.cpp">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="389" column="104" selection-start-line="389" selection-start-column="21" selection-end-line="389" selection-end-column="104" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/package/contents/ui/appearance.qml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -316,26 +495,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awkeys.h"> <entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding /> <folding>
<element signature="e#1286#1304#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awactions.cpp"> <entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awconfighelper.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="143" column="33" selection-start-line="143" selection-start-column="33" selection-end-line="143" selection-end-column="33" />
<folding /> <folding>
<element signature="e#1234#1261#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/awesome-widget/plugin/awactions.h"> <entry file="file://$PROJECT_DIR$/awesome-widget/package/contents/ui/advanced.qml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.6508951"> <state vertical-scroll-proportion="8.986733">
<caret line="41" column="76" selection-start-line="41" selection-start-column="76" selection-end-line="41" selection-end-column="76" /> <caret line="391" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="402" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

2
sources/awesome-widget/package/contents/ui/about.qml
View File

@ -25,7 +25,7 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: aboutPage id: aboutPage
AWActions { AWActions {
id: awActions; id: awActions
} }
width: childrenRect.width width: childrenRect.width

12
sources/awesome-widget/package/contents/ui/advanced.qml
View File

@ -25,7 +25,10 @@ Item {
id: advancedPage id: advancedPage
// backend // backend
AWActions { AWActions {
id: awActions; id: awActions
}
AWConfigHelper {
id: awConfig
} }
width: childrenRect.width width: childrenRect.width
@ -368,7 +371,7 @@ Item {
QtControls.Button { QtControls.Button {
width: parent.width * 3 / 5 width: parent.width * 3 / 5
text: i18n("Export configuration") text: i18n("Export configuration")
onClicked: awActions.exportConfiguration(plasmoid.configuration) onClicked: awConfig.exportConfiguration(plasmoid.configuration)
} }
} }
@ -383,7 +386,10 @@ Item {
width: parent.width * 3 / 5 width: parent.width * 3 / 5
text: i18n("Import configuration") text: i18n("Import configuration")
onClicked: { onClicked: {
console.log(awActions.importConfiguration()) if (debug) console.debug()
var importConfig = awConfig.importConfiguration()
for (var key in importConfig)
plasmoid.configuration[key] = importConfig[key]
} }
} }
} }

2
sources/awesome-widget/package/contents/ui/appearance.qml
View File

@ -27,7 +27,7 @@ Item {
id: appearancePage id: appearancePage
// backend // backend
AWActions { AWActions {
id: awActions; id: awActions
} }
width: childrenRect.width width: childrenRect.width

11
sources/awesome-widget/package/contents/ui/dataengine.qml
View File

@ -26,10 +26,13 @@ Item {
id: dataenginePage id: dataenginePage
// backend // backend
AWKeys { AWKeys {
id: awKeys; id: awKeys
} }
AWActions { AWActions {
id: awActions; id: awActions
}
AWConfigHelper {
id: awConfig
} }
width: childrenRect.width width: childrenRect.width
@ -39,7 +42,7 @@ Item {
property bool debug: awActions.isDebugEnabled() property bool debug: awActions.isDebugEnabled()
property variant cfg_dataengine: awActions.readDataEngineConfiguration() property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
Column { Column {
@ -354,6 +357,6 @@ Item {
cfg_dataengine["HDDDEV"] = hdd.currentText cfg_dataengine["HDDDEV"] = hdd.currentText
cfg_dataengine["PLAYER"] = player.currentText cfg_dataengine["PLAYER"] = player.currentText
cfg_dataengine["MPRIS"] = mpris.currentText cfg_dataengine["MPRIS"] = mpris.currentText
awActions.writeDataEngineConfiguration(cfg_dataengine) awConfig.writeDataEngineConfiguration(cfg_dataengine)
} }
} }

4
sources/awesome-widget/package/contents/ui/main.qml
View File

@ -31,10 +31,10 @@ Item {
id: main id: main
// backend // backend
AWKeys { AWKeys {
id: awKeys; id: awKeys
} }
AWActions { AWActions {
id: awActions; id: awActions
} }
property bool debug: awActions.isDebugEnabled() property bool debug: awActions.isDebugEnabled()

2
sources/awesome-widget/package/contents/ui/tooltip.qml
View File

@ -27,7 +27,7 @@ Item {
id: tooltipPage id: tooltipPage
// backend // backend
AWActions { AWActions {
id: awActions; id: awActions
} }
width: childrenRect.width width: childrenRect.width

4
sources/awesome-widget/package/contents/ui/widget.qml
View File

@ -26,10 +26,10 @@ Item {
id: widgetPage id: widgetPage
// backend // backend
AWKeys { AWKeys {
id: awKeys; id: awKeys
} }
AWActions { AWActions {
id: awActions; id: awActions
} }
width: childrenRect.width width: childrenRect.width

249
sources/awesome-widget/plugin/awactions.cpp
View File

@ -20,10 +20,7 @@
#include <KI18n/KLocalizedString> #include <KI18n/KLocalizedString>
#include <KNotifications/KNotification> #include <KNotifications/KNotification>
#include <QCheckBox>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDir>
#include <QFileDialog>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonParseError> #include <QJsonParseError>
#include <QMessageBox> #include <QMessageBox>
@ -32,10 +29,7 @@
#include <QNetworkReply> #include <QNetworkReply>
#include <QProcess> #include <QProcess>
#include <QProcessEnvironment> #include <QProcessEnvironment>
#include <QQmlPropertyMap>
#include <QSettings>
#include <QStandardPaths> #include <QStandardPaths>
#include <QVBoxLayout>
#include <fontdialog/fontdialog.h> #include <fontdialog/fontdialog.h>
@ -73,17 +67,6 @@ void AWActions::checkUpdates(const bool showAnyway)
} }
bool AWActions::dropCache() const
{
qCDebug(LOG_AW);
QString fileName = QString("%1/awesomewidgets.ndx").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
return QFile(fileName).remove();
}
// HACK: since QML could not use QLoggingCategory I need this hack // HACK: since QML could not use QLoggingCategory I need this hack
bool AWActions::isDebugEnabled() const bool AWActions::isDebugEnabled() const
{ {
@ -113,78 +96,6 @@ void AWActions::showReadme() const
} }
void AWActions::exportConfiguration(QObject *nativeConfig) const
{
qCDebug(LOG_AW);
// get file path and init settings object
QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export"));
if (fileName.isEmpty())
return;
qCInfo(LOG_AW) << "Selected filename" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
// additional parameters
QString baseDir = QString("%1/awesomewidgets").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QStringList dirs = QStringList() << QString("desktops") << QString("quotes")
<< QString("scripts") << QString("upgrade") << QString("weather");
// plasmoid configuration
QQmlPropertyMap *configuration = static_cast<QQmlPropertyMap *>(nativeConfig);
settings.beginGroup(QString("plasmoid"));
foreach(QString key, configuration->keys()) {
QVariant value = configuration->value(key);
if (!value.isValid())
continue;
settings.setValue(key, value);
}
settings.endGroup();
// extenstions
foreach(QString item, dirs) {
QStringList items = QDir(QString("%1/%2").arg(baseDir).arg(item)).entryList(
QStringList() << QString("*.desktop"), QDir::Files);
settings.beginGroup(item);
foreach(QString it, items) {
qCInfo(LOG_AW) << "Processing file" << it;
settings.beginGroup(it);
QSettings itemSettings(QString("%1/%2/%3").arg(baseDir).arg(item).arg(it), QSettings::IniFormat);
itemSettings.beginGroup(QString("Desktop Entry"));
foreach(QString key, itemSettings.childKeys())
settings.setValue(key, itemSettings.value(key));
itemSettings.endGroup();
settings.endGroup();
}
settings.endGroup();
}
// additional files
settings.beginGroup(QString("json"));
// script filters
QFile filterFile(QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(baseDir));
if (filterFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString filterText = filterFile.readAll();
filterFile.close();
settings.setValue(QString("filters"), filterText);
} else {
qCWarning(LOG_LIB) << "Could not open" << filterFile.fileName();
}
// weather icon settings
QFile weatherIdFile(QString("%1/weather/awesomewidgets-extweather-ids.json").arg(baseDir));
if (weatherIdFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString weatherIdText = weatherIdFile.readAll();
weatherIdFile.close();
settings.setValue(QString("weathers"), weatherIdText);
} else {
qCWarning(LOG_LIB) << "Could not open" << weatherIdFile.fileName();
}
settings.endGroup();
// sync settings
settings.sync();
}
// HACK: this method uses variables from version.h // HACK: this method uses variables from version.h
QString AWActions::getAboutText(const QString type) const QString AWActions::getAboutText(const QString type) const
{ {
@ -247,166 +158,6 @@ QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
} }
QQmlPropertyMap* AWActions::importConfiguration() const
{
qCDebug(LOG_AW);
QQmlPropertyMap *configuration = new QQmlPropertyMap();
// get file path and init settings object
QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import"));
if (fileName.isEmpty())
return configuration;
qCInfo(LOG_AW) << "Selected filename" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
// additional parameters
QString baseDir = QString("%1/awesomewidgets").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QStringList dirs = QStringList() << QString("desktops") << QString("quotes")
<< QString("scripts") << QString("upgrade") << QString("weather");
// check what should be exported
QDialog *dialog = new QDialog(nullptr);
QCheckBox *importPlasmoidSettings = new QCheckBox(i18n("Import plasmoid settings"), dialog);
QCheckBox *importExtensionsSettings = new QCheckBox(i18n("Import extenstions"), dialog);
QCheckBox *importAddsSettings = new QCheckBox(i18n("Import additional files"), dialog);
QDialogButtonBox *dialogButtons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
Qt::Horizontal, dialog);
QVBoxLayout *layout = new QVBoxLayout(dialog);
layout->addWidget(importPlasmoidSettings);
layout->addWidget(importExtensionsSettings);
layout->addWidget(importAddsSettings);
layout->addWidget(dialogButtons);
connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept()));
connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
// get parameters
bool importPlasmoid = false;
bool importExtensions = false;
bool importAdds = false;
switch(int ret = dialog->exec()) {
case QDialog::Accepted:
importPlasmoid = importPlasmoidSettings->isChecked();
importExtensions = importExtensionsSettings->isChecked();
importAdds = importAddsSettings->isChecked();
break;
case QDialog::Rejected:
default:
break;
}
dialog->deleteLater();
// extenstions
if (importExtensions) {
foreach(QString item, dirs) {
settings.beginGroup(item);
qDebug() << settings.childGroups();
foreach(QString it, settings.childGroups()) {
qCInfo(LOG_AW) << "Processing file" << it;
settings.beginGroup(it);
QSettings itemSettings(QString("%1/%2/%3").arg(baseDir).arg(item).arg(it), QSettings::IniFormat);
itemSettings.beginGroup(QString("Desktop Entry"));
foreach(QString key, settings.childKeys())
itemSettings.setValue(key, settings.value(key));
itemSettings.endGroup();
itemSettings.sync();
settings.endGroup();
}
settings.endGroup();
}
}
// additional files
if (importAdds) {
settings.beginGroup(QString("json"));
// script filters
if (settings.contains(QString("filters"))) {
QFile filterFile(QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(baseDir));
if (filterFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
QDataStream out(&filterFile);
out << settings.value(QString("filters")).toString();
filterFile.close();
} else {
qCWarning(LOG_LIB) << "Could not open" << filterFile.fileName();
}
}
// weather icon settings
if (settings.contains(QString("weathers"))) {
QFile weatherIdFile(QString("%1/weather/awesomewidgets-extweather-ids.json").arg(baseDir));
if (weatherIdFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
QDataStream out(&weatherIdFile);
out << settings.value(QString("weathers")).toString();
weatherIdFile.close();
} else {
qCWarning(LOG_LIB) << "Could not open" << weatherIdFile.fileName();
}
}
settings.endGroup();
}
// plasmoid configuration
if (importPlasmoid) {
settings.beginGroup(QString("plasmoid"));
foreach(QString key, settings.childKeys())
configuration->insert(key, settings.value(key));
configuration->insert(QString("valid"), true);
settings.endGroup();
}
return configuration;
}
QVariantMap AWActions::readDataEngineConfiguration() const
{
qCDebug(LOG_AW);
QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
QString("plasma-dataengine-extsysmon.conf"));
qCInfo(LOG_AW) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QVariantMap configuration;
settings.beginGroup(QString("Configuration"));
configuration[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/"));
configuration[QString("GPUDEV")] = settings.value(QString("GPUDEV"), QString("auto"));
configuration[QString("HDDDEV")] = settings.value(QString("HDDDEV"), QString("all"));
configuration[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
configuration[QString("MPDADDRESS")] = settings.value(QString("MPDADDRESS"), QString("localhost"));
configuration[QString("MPDPORT")] = settings.value(QString("MPDPORT"), QString("6600"));
configuration[QString("MPRIS")] = settings.value(QString("MPRIS"), QString("auto"));
configuration[QString("PLAYER")] = settings.value(QString("PLAYER"), QString("mpris"));
configuration[QString("PLAYERSYMBOLS")] = settings.value(QString("PLAYERSYMBOLS"), QString("10"));
settings.endGroup();
qCInfo(LOG_AW) << "Configuration" << configuration;
return configuration;
}
void AWActions::writeDataEngineConfiguration(const QVariantMap configuration) const
{
qCDebug(LOG_AW);
QString fileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
+ QString("/plasma-dataengine-extsysmon.conf");
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Configuration"));
settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]);
settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]);
settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]);
settings.setValue(QString("HDDTEMPCMD"), configuration[QString("HDDTEMPCMD")]);
settings.setValue(QString("MPDADDRESS"), configuration[QString("MPDADDRESS")]);
settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]);
settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]);
settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
settings.setValue(QString("PLAYERSYMBOLS"), configuration[QString("PLAYERSYMBOLS")]);
settings.endGroup();
settings.sync();
}
// to avoid additional object definition this method is static // to avoid additional object definition this method is static
void AWActions::sendNotification(const QString eventId, const QString message) void AWActions::sendNotification(const QString eventId, const QString message)

7
sources/awesome-widget/plugin/awactions.h
View File

@ -23,7 +23,6 @@
class QNetworkReply; class QNetworkReply;
class QQmlPropertyMap;
class AWActions : public QObject class AWActions : public QObject
{ {
@ -33,18 +32,12 @@ public:
explicit AWActions(QObject *parent = nullptr); explicit AWActions(QObject *parent = nullptr);
virtual ~AWActions(); virtual ~AWActions();
Q_INVOKABLE void checkUpdates(const bool showAnyway = false); Q_INVOKABLE void checkUpdates(const bool showAnyway = false);
Q_INVOKABLE bool dropCache() const;
Q_INVOKABLE bool isDebugEnabled() const; Q_INVOKABLE bool isDebugEnabled() const;
Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const; Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const;
Q_INVOKABLE void showReadme() const; Q_INVOKABLE void showReadme() const;
// configuration slots // configuration slots
Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const;
Q_INVOKABLE QString getAboutText(const QString type = QString("header")) const; Q_INVOKABLE QString getAboutText(const QString type = QString("header")) const;
Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const; Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const;
Q_INVOKABLE QQmlPropertyMap *importConfiguration() const;
// dataengine
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration) const;
public slots: public slots:
Q_INVOKABLE static void sendNotification(const QString eventId, const QString message); Q_INVOKABLE static void sendNotification(const QString eventId, const QString message);

312
sources/awesome-widget/plugin/awconfighelper.cpp Normal file
View File

@ -0,0 +1,312 @@
/***************************************************************************
* This file is part of awesome-widgets *
* *
* awesome-widgets is free software: you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* awesome-widgets is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#include "awconfighelper.h"
#include <KI18n/KLocalizedString>
#include <QCheckBox>
#include <QDialogButtonBox>
#include <QDir>
#include <QFileDialog>
#include <QQmlPropertyMap>
#include <QSettings>
#include <QTextCodec>
#include <QVBoxLayout>
#include "awdebug.h"
AWConfigHelper::AWConfigHelper(QObject *parent)
: QObject(parent)
{
qCDebug(LOG_AW);
}
AWConfigHelper::~AWConfigHelper()
{
qCDebug(LOG_AW);
}
bool AWConfigHelper::dropCache() const
{
qCDebug(LOG_AW);
QString fileName = QString("%1/awesomewidgets.ndx").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
return QFile(fileName).remove();
}
void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const
{
qCDebug(LOG_AW);
// get file path and init settings object
QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export"));
if (fileName.isEmpty())
return;
qCInfo(LOG_AW) << "Selected filename" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
// plasmoid configuration
QQmlPropertyMap *configuration = static_cast<QQmlPropertyMap *>(nativeConfig);
settings.beginGroup(QString("plasmoid"));
foreach(QString key, configuration->keys()) {
QVariant value = configuration->value(key);
if (!value.isValid())
continue;
settings.setValue(key, value);
}
settings.endGroup();
// extenstions
foreach(QString item, m_dirs) {
QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item)).entryList(
QStringList() << QString("*.desktop"), QDir::Files);
settings.beginGroup(item);
foreach(QString it, items)
copyExtensions(it, item, settings, false);
settings.endGroup();
}
// additional files
settings.beginGroup(QString("json"));
// script filters
readFile(settings, QString("filters"),
QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
readFile(settings, QString("weathers"),
QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
// sync settings
settings.sync();
}
QVariantMap AWConfigHelper::importConfiguration() const
{
qCDebug(LOG_AW);
QVariantMap configuration;
// get file path and init settings object
QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import"));
if (fileName.isEmpty())
return configuration;
qCInfo(LOG_AW) << "Selected filename" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QHash<QString, bool> selection = selectImport();
// extenstions
if (selection[QString("extenstions")]) {
foreach(QString item, m_dirs) {
settings.beginGroup(item);
foreach(QString it, settings.childGroups())
copyExtensions(it, item, settings, true);
settings.endGroup();
}
}
// additional files
if (selection[QString("adds")]) {
settings.beginGroup(QString("json"));
// script filters
writeFile(settings, QString("filters"),
QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
writeFile(settings, QString("weathers"),
QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
}
// plasmoid configuration
if (selection[QString("plasmoid")]) {
settings.beginGroup(QString("plasmoid"));
foreach(QString key, settings.childKeys())
configuration[key] = settings.value(key);
settings.endGroup();
}
return configuration;
}
QVariantMap AWConfigHelper::readDataEngineConfiguration() const
{
qCDebug(LOG_AW);
QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
QString("plasma-dataengine-extsysmon.conf"));
qCInfo(LOG_AW) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QVariantMap configuration;
settings.beginGroup(QString("Configuration"));
configuration[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/"));
configuration[QString("GPUDEV")] = settings.value(QString("GPUDEV"), QString("auto"));
configuration[QString("HDDDEV")] = settings.value(QString("HDDDEV"), QString("all"));
configuration[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
configuration[QString("MPDADDRESS")] = settings.value(QString("MPDADDRESS"), QString("localhost"));
configuration[QString("MPDPORT")] = settings.value(QString("MPDPORT"), QString("6600"));
configuration[QString("MPRIS")] = settings.value(QString("MPRIS"), QString("auto"));
configuration[QString("PLAYER")] = settings.value(QString("PLAYER"), QString("mpris"));
configuration[QString("PLAYERSYMBOLS")] = settings.value(QString("PLAYERSYMBOLS"), QString("10"));
settings.endGroup();
qCInfo(LOG_AW) << "Configuration" << configuration;
return configuration;
}
void AWConfigHelper::writeDataEngineConfiguration(const QVariantMap configuration) const
{
qCDebug(LOG_AW);
QString fileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
+ QString("/plasma-dataengine-extsysmon.conf");
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Configuration"));
settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]);
settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]);
settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]);
settings.setValue(QString("HDDTEMPCMD"), configuration[QString("HDDTEMPCMD")]);
settings.setValue(QString("MPDADDRESS"), configuration[QString("MPDADDRESS")]);
settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]);
settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]);
settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
settings.setValue(QString("PLAYERSYMBOLS"), configuration[QString("PLAYERSYMBOLS")]);
settings.endGroup();
settings.sync();
}
void AWConfigHelper::copyExtensions(const QString item, const QString type,
QSettings &settings, const bool inverse) const
{
qCDebug(LOG_AW);
qCDebug(LOG_AW) << "Extension" << item;
qCDebug(LOG_AW) << "Type" << type;
qCDebug(LOG_AW) << "Inverse" << inverse;
settings.beginGroup(item);
QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(type).arg(item), QSettings::IniFormat);
itemSettings.beginGroup(QString("Desktop Entry"));
if (inverse)
copySettings(settings, itemSettings);
else
copySettings(itemSettings, settings);
itemSettings.endGroup();
settings.endGroup();
if (inverse)
itemSettings.sync();
}
void AWConfigHelper::copySettings(QSettings &from, QSettings &to) const
{
qCDebug(LOG_AW);
foreach(QString key, from.childKeys())
to.setValue(key, from.value(key));
}
void AWConfigHelper::readFile(QSettings &settings, const QString key, const QString fileName) const
{
qCDebug(LOG_AW);
qCDebug(LOG_AW) << "Key" << key;
qCDebug(LOG_AW) << "File" << fileName;
QFile file(fileName);
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString text = QTextCodec::codecForMib(106)->toUnicode(file.readAll());
file.close();
settings.setValue(key, text);
} else {
qCWarning(LOG_LIB) << "Could not open" << file.fileName();
}
}
QHash<QString, bool> AWConfigHelper::selectImport() const
{
qCDebug(LOG_AW);
QDialog *dialog = new QDialog(nullptr);
QCheckBox *importPlasmoidSettings = new QCheckBox(i18n("Import plasmoid settings"), dialog);
importPlasmoidSettings->setChecked(true);
QCheckBox *importExtensionsSettings = new QCheckBox(i18n("Import extenstions"), dialog);
importExtensionsSettings->setChecked(true);
QCheckBox *importAddsSettings = new QCheckBox(i18n("Import additional files"), dialog);
importAddsSettings->setChecked(true);
QDialogButtonBox *dialogButtons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
Qt::Horizontal, dialog);
QVBoxLayout *layout = new QVBoxLayout(dialog);
layout->addWidget(importPlasmoidSettings);
layout->addWidget(importExtensionsSettings);
layout->addWidget(importAddsSettings);
layout->addWidget(dialogButtons);
connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept()));
connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
// get parameters
QHash<QString, bool> import;
import[QString("plasmoid")] = false;
import[QString("extenstions")] = false;
import[QString("adds")] = false;
switch(int ret = dialog->exec()) {
case QDialog::Accepted:
import[QString("plasmoid")] = importPlasmoidSettings->isChecked();
import[QString("extenstions")] = importExtensionsSettings->isChecked();
import[QString("adds")] = importAddsSettings->isChecked();
break;
case QDialog::Rejected:
default:
break;
}
dialog->deleteLater();
return import;
}
void AWConfigHelper::writeFile(QSettings &settings, const QString key, const QString fileName) const
{
qCDebug(LOG_AW);
qCDebug(LOG_AW) << "Key" << key;
qCDebug(LOG_AW) << "File" << fileName;
if (settings.contains(key)) {
QFile file(fileName);
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
QDataStream out(&file);
out << settings.value(key).toString().toUtf8();
file.close();
} else {
qCWarning(LOG_LIB) << "Could not open" << file.fileName();
}
}
}

58
sources/awesome-widget/plugin/awconfighelper.h Normal file
View File

@ -0,0 +1,58 @@
/***************************************************************************
* This file is part of awesome-widgets *
* *
* awesome-widgets is free software: you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* awesome-widgets is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
***************************************************************************/
#ifndef AWCONFIGHELPER_H
#define AWCONFIGHELPER_H
#include <QObject>
#include <QStandardPaths>
class QSettings;
class AWConfigHelper : public QObject
{
Q_OBJECT
public:
explicit AWConfigHelper(QObject *parent = nullptr);
virtual ~AWConfigHelper();
Q_INVOKABLE bool dropCache() const;
Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const;
Q_INVOKABLE QVariantMap importConfiguration() const;
// dataengine
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration) const;
private:
// methods
void copyExtensions(const QString item, const QString type,
QSettings &settings, const bool inverse) const;
void copySettings(QSettings &from, QSettings &to) const;
void readFile(QSettings &settings, const QString key, const QString fileName) const;
QHash<QString, bool> selectImport() const;
void writeFile(QSettings &settings, const QString key, const QString fileName) const;
// properties
QString m_baseDir = QString("%1/awesomewidgets").
arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QStringList m_dirs = QStringList() << QString("desktops") << QString("quotes")
<< QString("scripts") << QString("upgrade") << QString("weather");
};
#endif /* AWCONFIGHELPER_H */

2
sources/awesome-widget/plugin/awesomewidget.cpp
View File

@ -20,6 +20,7 @@
#include <QtQml> #include <QtQml>
#include "awactions.h" #include "awactions.h"
#include "awconfighelper.h"
#include "awkeys.h" #include "awkeys.h"
@ -28,5 +29,6 @@ void AWPlugin::registerTypes(const char *uri)
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget")); Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
qmlRegisterType<AWActions>(uri, 1, 0, "AWActions"); qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys"); qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
} }

2
sources/desktop-panel/package/contents/ui/about.qml
View File

@ -26,7 +26,7 @@ Item {
id: aboutPage id: aboutPage
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
width: childrenRect.width width: childrenRect.width

2
sources/desktop-panel/package/contents/ui/activeapp.qml
View File

@ -27,7 +27,7 @@ Item {
id: activeAppearancePage id: activeAppearancePage
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
width: childrenRect.width width: childrenRect.width

2
sources/desktop-panel/package/contents/ui/advanced.qml
View File

@ -27,7 +27,7 @@ Item {
id: advancedPage id: advancedPage
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
width: childrenRect.width width: childrenRect.width

2
sources/desktop-panel/package/contents/ui/inactiveapp.qml
View File

@ -27,7 +27,7 @@ Item {
id: inactiveAppearancePage id: inactiveAppearancePage
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
width: childrenRect.width width: childrenRect.width

2
sources/desktop-panel/package/contents/ui/main.qml
View File

@ -30,7 +30,7 @@ Item {
id: main id: main
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
property bool debug: dpAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()

2
sources/desktop-panel/package/contents/ui/widget.qml
View File

@ -25,7 +25,7 @@ Item {
id: widgetPage id: widgetPage
// backend // backend
DPAdds { DPAdds {
id: dpAdds; id: dpAdds
} }
width: childrenRect.width width: childrenRect.width

23
sources/translations/awesome-widgets.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -107,6 +107,12 @@ msgstr ""
msgid "Drop key cache" msgid "Drop key cache"
msgstr "" msgstr ""
msgid "Export configuration"
msgstr ""
msgid "Import configuration"
msgstr ""
msgid "Font" msgid "Font"
msgstr "" msgstr ""
@ -393,6 +399,21 @@ msgstr ""
msgid "There are updates" msgid "There are updates"
msgstr "" msgstr ""
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
msgid "Import extensions"
msgstr ""
msgid "Import additional files"
msgstr ""
msgid "AC online" msgid "AC online"
msgstr "" msgstr ""

32
sources/translations/en.po
View File

@ -6,16 +6,16 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-09-21 10:26+0300\n" "PO-Revision-Date: 2015-10-16 20:22+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: English <kde-russian@lists.kde.ru>\n" "Language-Team: English <kde-russian@lists.kde.ru>\n"
"Language: ru\n" "Language: ru\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 2.0\n" "X-Generator: Lokalize 2.0\n"
msgid "Widget" msgid "Widget"
@ -108,6 +108,12 @@ msgstr "AC offline tag"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "Drop key cache" msgstr "Drop key cache"
msgid "Export configuration"
msgstr "Export configuration"
msgid "Import configuration"
msgstr "Import configuration"
msgid "Font" msgid "Font"
msgstr "Font" msgstr "Font"
@ -398,6 +404,21 @@ msgstr "Click \"Ok\" to download"
msgid "There are updates" msgid "There are updates"
msgstr "There are updates" msgstr "There are updates"
msgid "Export"
msgstr "Export"
msgid "Import"
msgstr "Import"
msgid "Import plasmoid settings"
msgstr "Import plasmoid settings"
msgid "Import extensions"
msgstr "Import extensions"
msgid "Import additional files"
msgstr "Import additional files"
msgid "AC online" msgid "AC online"
msgstr "AC online" msgstr "AC online"
@ -750,9 +771,6 @@ msgstr "esalexeev@gmail.com"
#~ msgid "Appearance configuration" #~ msgid "Appearance configuration"
#~ msgstr "Appearance configuration" #~ msgstr "Appearance configuration"
#~ msgid "Tooltip configuration"
#~ msgstr "Tooltip configuration"
#~ msgid "Widget configuration" #~ msgid "Widget configuration"
#~ msgstr "Widget configuration" #~ msgstr "Widget configuration"

55
sources/translations/es.po
View File

@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE. # SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# #
# Translators: # Translators:
# Ernesto Avilés Vázquez <whippiii@gmail.com>, 2014-2015 # Ernesto Avilés Vázquez <whippiii@gmail.com>, 2014-2015
# Evgeniy Alekseev <esalexeev@gmail.com>, 2014-2015 # Evgeniy Alekseev <esalexeev@gmail.com>, 2014-2015
@ -9,14 +9,15 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Awesome widgets\n" "Project-Id-Version: Awesome widgets\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-09-26 22:07+0000\n" "PO-Revision-Date: 2015-09-26 22:07+0000\n"
"Last-Translator: Ernesto Avilés Vázquez <whippiii@gmail.com>\n" "Last-Translator: Ernesto Avilés Vázquez <whippiii@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/arcanis/awesome-widgets/language/es/)\n" "Language-Team: Spanish (http://www.transifex.com/arcanis/awesome-widgets/"
"language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "Widget" msgid "Widget"
@ -109,6 +110,12 @@ msgstr "Etiqueta para la alimentación desconectada"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "Borrar caché de claves" msgstr "Borrar caché de claves"
msgid "Export configuration"
msgstr ""
msgid "Import configuration"
msgstr ""
msgid "Font" msgid "Font"
msgstr "Tipo de letra" msgstr "Tipo de letra"
@ -238,7 +245,10 @@ msgstr "Comprobar actualizaciones"
msgid "" msgid ""
"CPU, CPU clock, memory, swap and network labels support graphical tooltip. " "CPU, CPU clock, memory, swap and network labels support graphical tooltip. "
"To enable them just make needed checkbox checked." "To enable them just make needed checkbox checked."
msgstr "Las etiquetas para CPU, reloj de CPU, memoria, swap y red soportan ventanas emergentes. Para habilitarlas, simplemente marca las casillas correspondientes." msgstr ""
"Las etiquetas para CPU, reloj de CPU, memoria, swap y red soportan ventanas "
"emergentes. Para habilitarlas, simplemente marca las casillas "
"correspondientes."
msgid "Number of values for tooltips" msgid "Number of values for tooltips"
msgstr "Número de valores para las ventanas emergentes" msgstr "Número de valores para las ventanas emergentes"
@ -292,9 +302,11 @@ msgid "Battery inactive color"
msgstr "Color de la batería inactiva" msgstr "Color de la batería inactiva"
msgid "" msgid ""
"Detailed information may be found on <a href=\"http://arcanis.name/projects" "Detailed information may be found on <a href=\"http://arcanis.name/projects/"
"/awesome-widgets/\">project homepage</a>" "awesome-widgets/\">project homepage</a>"
msgstr "Puedes encontrar información detallada en el <a href=\"http://arcanis.name/projects/awesome-widgets/\">sitio del proyecto</a>" msgstr ""
"Puedes encontrar información detallada en el <a href=\"http://arcanis.name/"
"projects/awesome-widgets/\">sitio del proyecto</a>"
msgid "AC" msgid "AC"
msgstr "CA" msgstr "CA"
@ -395,6 +407,23 @@ msgstr "Haz clic en «Ok» para descargar"
msgid "There are updates" msgid "There are updates"
msgstr "Hay actualizaciones disponibles" msgstr "Hay actualizaciones disponibles"
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
#, fuzzy
msgid "Import extensions"
msgstr "Extensiones"
#, fuzzy
msgid "Import additional files"
msgstr "Filtros adicionales"
msgid "AC online" msgid "AC online"
msgstr "Alimentación conectada" msgstr "Alimentación conectada"
@ -458,9 +487,13 @@ msgstr "Etiqueta"
msgid "" msgid ""
"<html><head/><body><p>Use YAHOO! finance ticker to get quotes for the " "<html><head/><body><p>Use YAHOO! finance ticker to get quotes for the "
"instrument. Refer to <a href=\"http://finance.yahoo.com/\"><span style=\" " "instrument. Refer to <a href=\"http://finance.yahoo.com/\"><span style=\" "
"text-decoration: underline; " "text-decoration: underline; color:#0057ae;\">http://finance.yahoo.com/</"
"color:#0057ae;\">http://finance.yahoo.com/</span></a></p></body></html>" "span></a></p></body></html>"
msgstr "<html><head/><body><p>Usa el tablero electrónico de YAHOO! para obtener la cotización del medio. Dirígete a <a href=\"http://finance.yahoo.com/\"><span style=\" text-decoration: underline; color:#0057ae;\">http://finance.yahoo.com/</span></a></p></body></html>" msgstr ""
"<html><head/><body><p>Usa el tablero electrónico de YAHOO! para obtener la "
"cotización del medio. Dirígete a <a href=\"http://finance.yahoo.com/\"><span "
"style=\" text-decoration: underline; color:#0057ae;\">http://finance.yahoo."
"com/</span></a></p></body></html>"
msgid "Ticker" msgid "Ticker"
msgstr "Tablero" msgstr "Tablero"

23
sources/translations/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-07-31 22:16+0300\n" "PO-Revision-Date: 2015-07-31 22:16+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: French <kde-russian@lists.kde.ru>\n" "Language-Team: French <kde-russian@lists.kde.ru>\n"
@ -112,6 +112,12 @@ msgstr "Étiquette alimentation débranchée"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "" msgstr ""
msgid "Export configuration"
msgstr ""
msgid "Import configuration"
msgstr ""
msgid "Font" msgid "Font"
msgstr "Police" msgstr "Police"
@ -416,6 +422,21 @@ msgstr "Cliquer sur \"Valider\" pour télécharger"
msgid "There are updates" msgid "There are updates"
msgstr "Des mises à jour sont disponibles" msgstr "Des mises à jour sont disponibles"
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
msgid "Import extensions"
msgstr ""
msgid "Import additional files"
msgstr ""
msgid "AC online" msgid "AC online"
msgstr "Alimentation branchée" msgstr "Alimentation branchée"

28
sources/translations/nl.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Awesome widgets\n" "Project-Id-Version: Awesome widgets\n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-08-20 22:52+0300\n" "PO-Revision-Date: 2015-08-20 22:52+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Dutch <kde-i18n-nl@kde.org>\n" "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@ -112,6 +112,14 @@ msgstr "AC offline-sleutelwoord"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "" msgstr ""
#, fuzzy
msgid "Export configuration"
msgstr "Configuratie"
#, fuzzy
msgid "Import configuration"
msgstr "Configuratie"
msgid "Font" msgid "Font"
msgstr "Lettertype" msgstr "Lettertype"
@ -416,6 +424,21 @@ msgstr "Klik op \"OK\" om te downloaden"
msgid "There are updates" msgid "There are updates"
msgstr "Er zijn updates" msgstr "Er zijn updates"
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
msgid "Import extensions"
msgstr ""
msgid "Import additional files"
msgstr ""
msgid "AC online" msgid "AC online"
msgstr "AC online" msgstr "AC online"
@ -726,9 +749,6 @@ msgstr "vistausss@outlook.com"
#~ msgid "<b>NOTE:</b> Player DBus interface should be an active" #~ msgid "<b>NOTE:</b> Player DBus interface should be an active"
#~ msgstr "<b>LET OP:</b> De DBus-interface van de speler moet actief zijn" #~ msgstr "<b>LET OP:</b> De DBus-interface van de speler moet actief zijn"
#~ msgid "Configuration"
#~ msgstr "Configuratie"
#~ msgid "Ctrl+B" #~ msgid "Ctrl+B"
#~ msgstr "Ctrl+B" #~ msgstr "Ctrl+B"

28
sources/translations/pt_BR.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-07-31 22:21+0300\n" "PO-Revision-Date: 2015-07-31 22:21+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@ -111,6 +111,14 @@ msgstr "Rótulo com carregador desconectado"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "" msgstr ""
#, fuzzy
msgid "Export configuration"
msgstr "Configuração"
#, fuzzy
msgid "Import configuration"
msgstr "Configuração"
msgid "Font" msgid "Font"
msgstr "Tamanho da fonte" msgstr "Tamanho da fonte"
@ -412,6 +420,21 @@ msgstr "Clique \"Ok\" para baixar"
msgid "There are updates" msgid "There are updates"
msgstr "Há atualizações disponíveis" msgstr "Há atualizações disponíveis"
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
msgid "Import extensions"
msgstr ""
msgid "Import additional files"
msgstr ""
msgid "AC online" msgid "AC online"
msgstr "Carregador conectado" msgstr "Carregador conectado"
@ -712,9 +735,6 @@ msgstr "under@insicuri.net"
#~ msgid "<b>NOTE:</b> Player DBus interface should be an active" #~ msgid "<b>NOTE:</b> Player DBus interface should be an active"
#~ msgstr "<b>NOTA:</> Interface do player DBus deverá ser uma ativa" #~ msgstr "<b>NOTA:</> Interface do player DBus deverá ser uma ativa"
#~ msgid "Configuration"
#~ msgstr "Configuração"
#~ msgid "Ctrl+B" #~ msgid "Ctrl+B"
#~ msgstr "Ctrl+B" #~ msgstr "Ctrl+B"

28
sources/translations/ru.po
View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-09-26 21:53+0300\n" "PO-Revision-Date: 2015-10-16 20:23+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
"Language: ru\n" "Language: ru\n"
@ -108,6 +108,12 @@ msgstr "AC отключен"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "Сбросить кеш ключей" msgstr "Сбросить кеш ключей"
msgid "Export configuration"
msgstr "Экспорт настроек"
msgid "Import configuration"
msgstr "Импорт настроек"
msgid "Font" msgid "Font"
msgstr "Шрифт" msgstr "Шрифт"
@ -398,6 +404,21 @@ msgstr "Нажмите \"Ok\" для загрузки"
msgid "There are updates" msgid "There are updates"
msgstr "Найдены обновления" msgstr "Найдены обновления"
msgid "Export"
msgstr "Экспорт"
msgid "Import"
msgstr "Импорт"
msgid "Import plasmoid settings"
msgstr "Импорт настроек плазмоида"
msgid "Import extensions"
msgstr "Импорт расширений"
msgid "Import additional files"
msgstr "Импорт дополнительных файлов"
msgid "AC online" msgid "AC online"
msgstr "AC подключен" msgstr "AC подключен"
@ -750,9 +771,6 @@ msgstr "esalexeev@gmail.com"
#~ msgid "Appearance configuration" #~ msgid "Appearance configuration"
#~ msgstr "Настройка внешнего вида" #~ msgstr "Настройка внешнего вида"
#~ msgid "Tooltip configuration"
#~ msgstr "Настройка тултипа"
#~ msgid "Widget configuration" #~ msgid "Widget configuration"
#~ msgstr "Настройка виджета" #~ msgstr "Настройка виджета"

34
sources/translations/uk.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-09-27 12:37+0300\n" "PO-Revision-Date: 2015-09-27 12:37+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n" "Language-Team: Ukrainian <kde-russian@lists.kde.ru>\n"
@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 2.0\n" "X-Generator: Lokalize 2.0\n"
msgid "Widget" msgid "Widget"
@ -110,6 +110,14 @@ msgstr "AC відключений"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "Скинути кеш ключів" msgstr "Скинути кеш ключів"
#, fuzzy
msgid "Export configuration"
msgstr "Налаштування"
#, fuzzy
msgid "Import configuration"
msgstr "Налаштування"
msgid "Font" msgid "Font"
msgstr "Шрифт" msgstr "Шрифт"
@ -412,6 +420,23 @@ msgstr "Натисніть \"Ok\" для завантаження"
msgid "There are updates" msgid "There are updates"
msgstr "Знайдені оновлення" msgstr "Знайдені оновлення"
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
#, fuzzy
msgid "Import extensions"
msgstr "Розширення"
#, fuzzy
msgid "Import additional files"
msgstr "Додаткові фільтри"
msgid "AC online" msgid "AC online"
msgstr "AC підключений" msgstr "AC підключений"
@ -727,9 +752,6 @@ msgstr "sarumyan@i.ua"
#~ msgid "<b>NOTE:</b> Player DBus interface should be an active" #~ msgid "<b>NOTE:</b> Player DBus interface should be an active"
#~ msgstr "<b>УВАГА:</b> DBus інтерфейс плеєра має бути активним" #~ msgstr "<b>УВАГА:</b> DBus інтерфейс плеєра має бути активним"
#~ msgid "Configuration"
#~ msgstr "Налаштування"
#~ msgid "Ctrl+B" #~ msgid "Ctrl+B"
#~ msgstr "Ctrl+B" #~ msgstr "Ctrl+B"

23
sources/translations/zh.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n" "Report-Msgid-Bugs-To: https://github.com/arcan1s/awesome-widgets/issues\n"
"POT-Creation-Date: 2015-09-21 20:49+0300\n" "POT-Creation-Date: 2015-10-16 20:22+0300\n"
"PO-Revision-Date: 2015-07-31 22:24+0300\n" "PO-Revision-Date: 2015-07-31 22:24+0300\n"
"Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n" "Last-Translator: Evgeniy Alekseev <esalexeev@gmail.com>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@ -108,6 +108,12 @@ msgstr "外接电源未使用标签"
msgid "Drop key cache" msgid "Drop key cache"
msgstr "" msgstr ""
msgid "Export configuration"
msgstr ""
msgid "Import configuration"
msgstr ""
msgid "Font" msgid "Font"
msgstr "字体" msgstr "字体"
@ -412,6 +418,21 @@ msgstr ""
msgid "There are updates" msgid "There are updates"
msgstr "" msgstr ""
msgid "Export"
msgstr ""
msgid "Import"
msgstr ""
msgid "Import plasmoid settings"
msgstr ""
msgid "Import extensions"
msgstr ""
msgid "Import additional files"
msgstr ""
#, fuzzy #, fuzzy
msgid "AC online" msgid "AC online"
msgstr "外接电源使用中标签" msgstr "外接电源使用中标签"