vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ported to new KDialog/KPageWidget/KPageDialog 

svn path=/trunk/KDE/kdebase/workspace/; revision=551107
icc-effect-5.14.5
Tobias Koenig 2006-06-13 17:41:00 +00:00
parent 04c9d42dfd
commit 9bb648da59
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kcmkwin/kwinrules/detectwidget.cpp
View File

@ -46,9 +46,13 @@ DetectWidget::DetectWidget( QWidget* parent, const char* name )
} }
DetectDialog::DetectDialog( QWidget* parent, const char* name ) DetectDialog::DetectDialog( QWidget* parent, const char* name )
: KDialogBase( Swallow, 0, parent, name, true, "", Ok | Cancel ) : KDialog( parent ),
, grabber( NULL ) grabber( NULL )
{ {
setObjectName( name );
setModal( true );
setButtons( Ok | Cancel );
widget = new DetectWidget( this ); widget = new DetectWidget( this );
setMainWidget( widget ); setMainWidget( widget );
} }

4
kcmkwin/kwinrules/detectwidget.h
View File

@ -22,7 +22,7 @@
#include "detectwidgetbase.h" #include "detectwidgetbase.h"
#include <kdialogbase.h> #include <kdialog.h>
#include <kwin.h> #include <kwin.h>
#include "../../rules.h" #include "../../rules.h"
@ -42,7 +42,7 @@ class DetectWidget
}; };
class DetectDialog class DetectDialog
: public KDialogBase : public KDialog
{ {
Q_OBJECT Q_OBJECT
public: public:

24
kcmkwin/kwinrules/ruleswidget.cpp
View File

@ -687,10 +687,15 @@ void RulesWidget::shortcutEditClicked()
} }
RulesDialog::RulesDialog( QWidget* parent, const char* name ) RulesDialog::RulesDialog( QWidget* parent, const char* name )
: KDialogBase( Swallow, 0, parent, name, true, i18n( "Edit Window-Specific Settings" ), Ok | Cancel ) : KDialog( parent )
{ {
widget = new RulesWidget( this ); setObjectName( name );
setMainWidget( widget ); setModal( true );
setCaption( i18n( "Edit Window-Specific Settings" ) );
setButtons( Ok | Cancel );
widget = new RulesWidget( this );
setMainWidget( widget );
} }
// window is set only for Alt+F3/Window-specific settings, because the dialog // window is set only for Alt+F3/Window-specific settings, because the dialog
@ -725,7 +730,7 @@ void RulesDialog::accept()
if( !widget->finalCheck()) if( !widget->finalCheck())
return; return;
rules = widget->rules(); rules = widget->rules();
KDialogBase::accept(); KDialog::accept();
} }
EditShortcut::EditShortcut( QWidget* parent ) EditShortcut::EditShortcut( QWidget* parent )
@ -746,10 +751,15 @@ void EditShortcut::clearShortcut()
} }
EditShortcutDialog::EditShortcutDialog( QWidget* parent, const char* name ) EditShortcutDialog::EditShortcutDialog( QWidget* parent, const char* name )
: KDialogBase( Swallow, 0, parent, name, true, i18n( "Edit Shortcut" ), Ok | Cancel ) : KDialog( parent )
{ {
widget = new EditShortcut( this ); setObjectName( name );
setMainWidget( widget ); setModal( true );
setCaption( i18n( "Edit Shortcut" ) );
setButtons( Ok | Cancel );
widget = new EditShortcut( this );
setMainWidget( widget );
} }
void EditShortcutDialog::setShortcut( const QString& cut ) void EditShortcutDialog::setShortcut( const QString& cut )

6
kcmkwin/kwinrules/ruleswidget.h
View File

@ -20,7 +20,7 @@
#ifndef __RULESWIDGET_H__ #ifndef __RULESWIDGET_H__
#define __RULESWIDGET_H__ #define __RULESWIDGET_H__
#include <kdialogbase.h> #include <kdialog.h>
#include <kwin.h> #include <kwin.h>
#include <kshortcutdialog.h> #include <kshortcutdialog.h>
@ -95,7 +95,7 @@ class RulesWidget
}; };
class RulesDialog class RulesDialog
: public KDialogBase : public KDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -122,7 +122,7 @@ class EditShortcut
}; };
class EditShortcutDialog class EditShortcutDialog
: public KDialogBase : public KDialog
{ {
Q_OBJECT Q_OBJECT
public: public: