Fix symbol clash on ConfigDialog between this and systemsettings
which makes it crash on trying to open this kcm with plastik deco active and non-hidden-visibility build svn path=/trunk/KDE/kdebase/workspace/; revision=1068280icc-effect-5.14.5
parent
63697902e3
commit
3073e12f4e
|
@ -43,7 +43,7 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
|
||||||
KGlobal::locale()->insertCatalog("kwin_clients");
|
KGlobal::locale()->insertCatalog("kwin_clients");
|
||||||
|
|
||||||
// create and show the configuration dialog
|
// create and show the configuration dialog
|
||||||
m_dialog = new ConfigDialog(parent);
|
m_dialog = new PlastikConfigDialog(parent);
|
||||||
m_dialog->show();
|
m_dialog->show();
|
||||||
|
|
||||||
// load the configuration
|
// load the configuration
|
||||||
|
|
|
@ -27,10 +27,10 @@
|
||||||
#include "ui_configdialog.h"
|
#include "ui_configdialog.h"
|
||||||
class KConfig;
|
class KConfig;
|
||||||
|
|
||||||
class ConfigDialog : public QWidget, public Ui::ConfigDialog
|
class PlastikConfigDialog : public QWidget, public Ui::PlastikConfigDialog
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ConfigDialog( QWidget *parent ) : QWidget( parent ) {
|
PlastikConfigDialog( QWidget *parent ) : QWidget( parent ) {
|
||||||
setupUi( this );
|
setupUi( this );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -53,7 +53,7 @@ public slots:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
KConfig *m_config;
|
KConfig *m_config;
|
||||||
ConfigDialog *m_dialog;
|
PlastikConfigDialog *m_dialog;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // KNIFTYCONFIG_H
|
#endif // KNIFTYCONFIG_H
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
<ui version="4.0" >
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<class>ConfigDialog</class>
|
<ui version="4.0">
|
||||||
<widget class="QWidget" name="ConfigDialog" >
|
<class>PlastikConfigDialog</class>
|
||||||
<property name="geometry" >
|
<widget class="QWidget" name="PlastikConfigDialog">
|
||||||
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
|
@ -9,92 +10,89 @@
|
||||||
<height>176</height>
|
<height>176</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle" >
|
<property name="windowTitle">
|
||||||
<string>Config Dialog</string>
|
<string>Config Dialog</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" >
|
<layout class="QVBoxLayout">
|
||||||
<property name="margin" >
|
<property name="margin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="KButtonGroup" name="titleAlign" >
|
<widget class="KButtonGroup" name="titleAlign">
|
||||||
<property name="title" >
|
<property name="title">
|
||||||
<string>Title &Alignment</string>
|
<string>Title &Alignment</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout" >
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="AlignLeft" >
|
<widget class="QRadioButton" name="AlignLeft">
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Left</string>
|
<string>Left</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="AlignHCenter" >
|
<widget class="QRadioButton" name="AlignHCenter">
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Center</string>
|
<string>Center</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QRadioButton" name="AlignRight" >
|
<widget class="QRadioButton" name="AlignRight">
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Right</string>
|
<string>Right</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
<zorder>AlignLeft</zorder>
|
|
||||||
<zorder>AlignHCenter</zorder>
|
|
||||||
<zorder>AlignRight</zorder>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="coloredBorder" >
|
<widget class="QCheckBox" name="coloredBorder">
|
||||||
<property name="whatsThis" >
|
<property name="whatsThis">
|
||||||
<string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
|
<string>Check this option if the window border should be painted in the titlebar color. Otherwise it will be painted in the background color.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Colored window border</string>
|
<string>Colored window border</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="shortcut" >
|
<property name="shortcut">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="titleShadow" >
|
<widget class="QCheckBox" name="titleShadow">
|
||||||
<property name="whatsThis" >
|
<property name="whatsThis">
|
||||||
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
|
<string>Check this option if you want the titlebar text to have a 3D look with a shadow behind it.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Use shadowed &text</string>
|
<string>Use shadowed &text</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="animateButtons" >
|
<widget class="QCheckBox" name="animateButtons">
|
||||||
<property name="whatsThis" >
|
<property name="whatsThis">
|
||||||
<string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string>
|
<string>Check this option if you want the buttons to fade in when the mouse pointer hovers over them and fade out again when it moves away.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Animate buttons</string>
|
<string>Animate buttons</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="menuClose" >
|
<widget class="QCheckBox" name="menuClose">
|
||||||
<property name="whatsThis" >
|
<property name="whatsThis">
|
||||||
<string>Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows.</string>
|
<string>Check this option if you want windows to be closed when you double click the menu button, similar to Microsoft Windows.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text" >
|
<property name="text">
|
||||||
<string>Close windows by double clicking the menu button</string>
|
<string>Close windows by double clicking the menu button</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
<customwidget>
|
<customwidget>
|
||||||
<class>KButtonGroup</class>
|
<class>KButtonGroup</class>
|
||||||
<extends>QGroupBox</extends>
|
<extends>QGroupBox</extends>
|
||||||
|
|
Loading…
Reference in New Issue