[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdewebdev/quanta
From: Andras Mantia <amantia () kde ! org>
Date: 2008-04-14 19:10:49
Message-ID: 1208200249.534162.28963.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 797035 by amantia:
Add config page for user toolbars.
M +13 -2 plugins/usertoolbars/CMakeLists.txt
A plugins/usertoolbars/kcm_kdev_usertoolbars.desktop
M +27 -8 plugins/usertoolbars/usertoolbarsglobalconfig.cpp
M +6 -5 plugins/usertoolbars/usertoolbarsglobalconfig.h
M +2 -2 plugins/usertoolbars/usertoolbarspart.cpp
M +20 -20 quanta.kdevelop
--- trunk/KDE/kdewebdev/quanta/plugins/usertoolbars/CMakeLists.txt #797034:797035
@@ -13,7 +13,6 @@
set(kdevusertoolbars_PART_SRCS
usertoolbarspart.cpp
- usertoolbarsglobalconfig.cpp
toolbarxmlgui.cpp
toolbartabwidget.cpp
toolbarguibuilder.cpp
@@ -28,7 +27,6 @@
kdevusertoolbars_PART_SRCS
actionconfigdialogbase.ui
maildialogbase.ui
- usertoolbarsglobalconfigbase.ui
)
kde4_add_plugin(kdevusertoolbars WITH_PREFIX ${kdevusertoolbars_PART_SRCS})
@@ -48,3 +46,16 @@
install( FILES kdevusertoolbars.rc DESTINATION \
${DATA_INSTALL_DIR}/kdevusertoolbars) install( FILES global DESTINATION \
${DATA_INSTALL_DIR}/kdevusertoolbars)
+#preferences-plugin
+set(usertoolbarpreferences_PART_SRCS
+ usertoolbarsglobalconfig.cpp
+)
+
+kde4_add_ui_files(usertoolbarpreferences_PART_SRCS usertoolbarsglobalconfigbase.ui)
+
+kde4_add_plugin(kcm_kdev_usertoolbars ${usertoolbarpreferences_PART_SRCS})
+
+target_link_libraries(kcm_kdev_usertoolbars kdevquanta kdevplatforminterfaces \
${KDE4_KDECORE_LIBS} ${KDE4_KUTILS_LIBS}) +
+install(TARGETS kcm_kdev_usertoolbars DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES kcm_kdev_usertoolbars.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- trunk/KDE/kdewebdev/quanta/plugins/usertoolbars/usertoolbarsglobalconfig.cpp \
#797034:797035 @@ -15,22 +15,41 @@
#include "usertoolbarsglobalconfig.h"
#include "usertoolbarspart.h"
+#include <kglobal.h>
+#include <kconfiggroup.h>
+#include <kpluginfactory.h>
+
//qt includes
#include <QCheckBox>
-UserToolbarsGlobalConfig::UserToolbarsGlobalConfig(UserToolbarsPart *part, QWidget \
*parent)
- : QWidget(parent), m_part(part)
+K_PLUGIN_FACTORY(UserToolbarsConfigFactory, \
registerPlugin<UserToolbarsGlobalConfig>(); ) +
+K_EXPORT_PLUGIN(UserToolbarsConfigFactory("kcm_kdev_usertoolbars"))
+
+UserToolbarsGlobalConfig::UserToolbarsGlobalConfig(QWidget *parent, const \
QVariantList &args) + : KCModule( UserToolbarsConfigFactory::componentData(), \
parent, args ) {
- setupUi(this);
- separateToolbars->setChecked(m_part->separateToolbars());
- createActionsMenu->setChecked(m_part->createActionsMenu());
+ m_ui = new Ui::UserToolbarsGlobalConfigBase;
+ m_ui->setupUi(this);
+ KConfigGroup config( KGlobal::config(), "General" );
+ bool separateToolbars = config.readEntry("Separate toolbars", true);
+ bool createActionsMenu = config.readEntry("Create Actions menu", true);
+ m_ui->separateToolbars->setChecked(separateToolbars);
+ m_ui->createActionsMenu->setChecked(createActionsMenu);
}
+UserToolbarsGlobalConfig::~UserToolbarsGlobalConfig()
+{
+ delete m_ui;
+ m_ui = 0L;
+}
+
void UserToolbarsGlobalConfig::accept()
{
- m_part->setSeparateToolbars(separateToolbars->isChecked());
- m_part->setCreateActionsMenu(createActionsMenu->isChecked());
- m_part->saveConfig();
+ KConfigGroup config( KGlobal::config(), "General" );
+ config.writeEntry("Separate toolbars", m_ui->separateToolbars->isChecked());
+ config.writeEntry("Create Actions menu", (m_ui->createActionsMenu->isChecked()));
+ config.sync();
}
#include "usertoolbarsglobalconfig.moc"
--- trunk/KDE/kdewebdev/quanta/plugins/usertoolbars/usertoolbarsglobalconfig.h \
#797034:797035 @@ -15,21 +15,22 @@
#ifndef USERTOOLBARS_GLOBAL_CONFIG_H
#define USERTOOLBARS_GLOBAL_CONFIG_H
+#include <kcmodule.h>
+
#include "ui_usertoolbarsglobalconfigbase.h"
-class UserToolbarsPart;
-
-class UserToolbarsGlobalConfig: public QWidget, public \
Ui::UserToolbarsGlobalConfigBase +class UserToolbarsGlobalConfig: public KCModule
{
Q_OBJECT
public:
- explicit UserToolbarsGlobalConfig(UserToolbarsPart *part, QWidget *parent = 0);
+ explicit UserToolbarsGlobalConfig(QWidget *parent, const QVariantList &args = \
QVariantList() ); + ~UserToolbarsGlobalConfig();
public slots:
void accept();
private:
- UserToolbarsPart *m_part;
+ Ui::UserToolbarsGlobalConfigBase *m_ui;
};
#endif
--- trunk/KDE/kdewebdev/quanta/plugins/usertoolbars/usertoolbarspart.cpp \
#797034:797035 @@ -267,7 +267,7 @@
void UserToolbarsPart::insertConfigWidget(const KDialog *dlg, QWidget *page, \
unsigned int pageNo) {
// create configuraton dialogs here
- switch (pageNo)
+/* switch (pageNo)
{
case GLOBALDOC_OPTIONS:
{
@@ -275,7 +275,7 @@
connect(dlg, SIGNAL(okClicked()), w, SLOT(accept()));
break;
}
- }
+ }*/
}
void UserToolbarsPart::contextMenu(KMenu *popup, const KDevelop::Context *context)
--- trunk/KDE/kdewebdev/quanta/quanta.kdevelop #797034:797035
@@ -14,8 +14,8 @@
<secondaryLanguages>
<language>C</language>
</secondaryLanguages>
- <description/>
- <defaultencoding/>
+ <description></description>
+ <defaultencoding></defaultencoding>
<versioncontrol/>
<projectname>quanta</projectname>
</general>
@@ -25,7 +25,7 @@
<mainprogram>/opt/kde4/bin/quanta</mainprogram>
<directoryradio>build</directoryradio>
<customdirectory>/</customdirectory>
- <programargs/>
+ <programargs>-style plastique</programargs>
<terminal>false</terminal>
<autocompile>true</autocompile>
<envvars>
@@ -38,7 +38,7 @@
<envvar value="/opt/qt4" name="QTDIR" />
<envvar value="/opt/kde4/share:$XDG_DATA_DIRS" name="XDG_DATA_DIRS" />
</envvars>
- <globaldebugarguments/>
+ <globaldebugarguments></globaldebugarguments>
<globalcwd>/data/development/build/kde-trunk/kdewebdev</globalcwd>
<useglobalprogram>false</useglobalprogram>
<autoinstall>false</autoinstall>
@@ -52,7 +52,7 @@
<abortonerror>true</abortonerror>
<numberofjobs>2</numberofjobs>
<dontact>false</dontact>
- <makebin/>
+ <makebin></makebin>
<selectedenvironment>default</selectedenvironment>
<environments>
<default>
@@ -63,8 +63,8 @@
</default>
</environments>
<prio>0</prio>
- <defaulttarget/>
- <makeoptions/>
+ <defaulttarget></defaulttarget>
+ <makeoptions></makeoptions>
</make>
<general>
<projectmanagement>KDevCustomProject</projectmanagement>
@@ -91,9 +91,9 @@
<blacklist/>
<other>
<prio>0</prio>
- <otherbin/>
- <defaulttarget/>
- <otheroptions/>
+ <otherbin></otherbin>
+ <defaulttarget></defaulttarget>
+ <otheroptions></otheroptions>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -102,16 +102,16 @@
</kdevcustomproject>
<kdevfilecreate>
<filetypes>
- <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+ <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
<descr>A new empty C++ file.</descr>
</type>
- <type icon="source_h" ext="h" create="template" name="C/C++ Header" >
+ <type icon="source_h" ext="h" name="C/C++ Header" create="template" >
<descr>A new empty header file for C or C++.</descr>
</type>
- <type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
+ <type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
<descr>A new empty C++ file.</descr>
</type>
- <type icon="source_f" ext="for" create="template" name="Preprocessed Fortran" \
> + <type icon="source_f" ext="for" name="Preprocessed Fortran" \
> create="template" >
<descr>A new empty preprocessed Fortran file.</descr>
</type>
</filetypes>
@@ -181,7 +181,7 @@
<designerpluginpaths/>
</qt>
<creategettersetter>
- <prefixGet/>
+ <prefixGet></prefixGet>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>
@@ -214,11 +214,11 @@
<projectdirectory>/data/development/sources/kde-trunk/kdewebdev</projectdirectory>
<absoluteprojectpath>true</absoluteprojectpath>
<programargs/>
- <gdbpath/>
- <dbgshell/>
- <configGdbScript/>
- <runShellScript/>
- <runGdbScript/>
+ <gdbpath></gdbpath>
+ <dbgshell></dbgshell>
+ <configGdbScript></configGdbScript>
+ <runShellScript></runShellScript>
+ <runGdbScript></runGdbScript>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic