diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt index ec3953381..d9576a85f 100644 --- a/settings/CMakeLists.txt +++ b/settings/CMakeLists.txt @@ -7,7 +7,9 @@ set(kcm_konsole_PART_SRCS schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp ) kde4_automoc(${kcm_konsole_PART_SRCS}) -kde4_add_ui3_files(kcm_konsole_PART_SRCS schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui) +kde4_add_ui3_files(kcm_konsole_PART_SRCS schemadialog.ui kcmkonsoledialog.ui) + +kde4_add_ui_files(kcm_konsole_PART_SRCS sessiondialog.ui) kde4_add_plugin(kcm_konsole ${kcm_konsole_PART_SRCS}) diff --git a/settings/kcmkonsoledialog.ui b/settings/kcmkonsoledialog.ui index e7ab0bd13..71186ff30 100644 --- a/settings/kcmkonsoledialog.ui +++ b/settings/kcmkonsoledialog.ui @@ -387,9 +387,6 @@ - knuminput.h - knuminput.h - knuminput.h knuminput.h schemaeditor.h sessioneditor.h diff --git a/settings/sessiondialog.ui b/settings/sessiondialog.ui index 99b41ea32..25d93e81e 100644 --- a/settings/sessiondialog.ui +++ b/settings/sessiondialog.ui @@ -1,423 +1,403 @@ - -SessionDialog - - - SessionDialog + + + + + SessionDialog + + + + 0 + 0 + 410 + 476 + - - - 0 - 0 - 410 - 476 - + + Konsole Session Editor - - Konsole Session Editor - - - - - - - - unnamed - - + + + 0 + + + + 0 - - - - layout8 - - - - unnamed + + + + + Properties + + + + 0 - - - propertiesGroup + + + + 0 - - Properties - - - - unnamed - - - - Layout29 - - - - unnamed - - - - - <Default> - - - - - Normal - - - - - Tiny - - - - - Small - - - - - Medium - - - - - Large - - - - - Huge - - - - - Linux - - - - - Unicode - - - - - Custom - - - - fontCombo - - - - - termLine - - - - 7 - 5 - 0 - 0 - - - - - - keytabCombo - - - - - TextLabel5 - - - &Font: - - - fontCombo - - - - - schemaCombo - - - - - TextLabel7 - - - Sc&hema: - - - schemaCombo - - - - - TextLabel8 - - - $&TERM: - - - termLine - - - - - TextLabel6 - - - &Keytab: - - - keytabCombo - - - - - - - previewIcon - - - - 100 - 100 - - - - - 100 - 100 - - - - - - - - - TextLabel4 - - - - 7 - 0 - 0 - 0 - - - - - 90 - 100 - - - - &Icon: - - - AlignTop|AlignLeft - - - previewIcon - - - - - - - sessionGroup - - - Session - - - - unnamed - - - - sessionList - - - - - Layout3 - - - - unnamed - - - - saveButton - - - Sa&ve Session... - - - - - removeButton - - - &Remove Session - - - - - Spacer7 - - - Horizontal - - - Expanding - - - - 20 - 20 - - - - - - - - - - generalGroup - - - - 5 + + + + + <Default> + + + + + Normal + + + + + Tiny + + + + + Small + + + + + Medium + + + + + Large + + + + + Huge + + + + + Linux + + + + + Unicode + + + + + Custom + + + + + + + + + 7 5 0 0 - - - - General - - - - unnamed + - - - layout6 + + + + + + + + + &Font: + + + fontCombo + + + false + + + + + + + + + + Sc&hema: + + + schemaCombo + + + false + + + + + + + $&TERM: + + + termLine + + + false + + + + + + + &Keytab: + + + keytabCombo + + + false + + + + + + + + + + 100 + 100 + + + + + 100 + 100 + + + + + + + + + + + + 7 + 0 + 0 + 0 + + + + + 90 + 100 + + + + &Icon: + + + Qt::AlignTop|Qt::AlignLeft + + + previewIcon + + + false + + + + + + + + + + Session + + + + 0 + + + + + + + + 0 + + + + + Sa&ve Session... + + + + + + + &Remove Session + + + + + + + + 20 + 20 + + + + Expanding + + + Horizontal + + + + + + + + + + + + + 5 + 5 + 0 + 0 + + + + General + + + + 0 + + + + + 0 + + + + + 0 + + + + + + 0 + 5 + 0 + 0 + - - - unnamed - - - - layout5 - - - - unnamed - - - - TextLabel1 - - - - 0 - 5 - 0 - 0 - - - - &Name: - - - nameLine - - - - - TextLabel2 - - - E&xecute: - - - executeLine - - - - - TextLabel3 - - - &Directory: - - - directoryLine - - - - - - - layout4 - - - - unnamed - - - - nameLine - - - - 7 - 5 - 0 - 0 - - - - - - executeLine - - - - 7 - 5 - 0 - 0 - - - - - - directoryLine - - - - - - - - - - - - - - - + + &Name: + + + nameLine + + + false + + + + + + + E&xecute: + + + executeLine + + + false + + + + + + + &Directory: + + + directoryLine + + + false + + + + + + + + + 0 + + + + + + 7 + 5 + 0 + 0 + + + + + + + + + 7 + 5 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + qPixmapFromMimeSource + + + KIconButton +
kicondialog.h
+ 0 + + + nameLine executeLine directoryLine @@ -429,23 +409,12 @@ termLine keytabCombo schemaCombo - - - kcolorbutton.h - kdialog.h - - - - KIconButton -
kicondialog.h
- 0 - - - - - - kurlrequester.h - klineedit.h - kpushbutton.h - - + + + kcolorbutton.h + kdialog.h + kurlrequester.h + klineedit.h + kpushbutton.h + + diff --git a/settings/sessioneditor.cpp b/settings/sessioneditor.cpp index 5a454f747..46c2172e2 100644 --- a/settings/sessioneditor.cpp +++ b/settings/sessioneditor.cpp @@ -49,8 +49,8 @@ class SessionListBoxText : public Q3ListBoxText QString m_filename; }; -SessionEditor::SessionEditor(QWidget * parent, const char *name) -:SessionDialog(parent, name) +SessionEditor::SessionEditor(QWidget * parent) +:SessionDialog(parent) { sesMod=false; oldSession=-1; diff --git a/settings/sessioneditor.h b/settings/sessioneditor.h index 5af1c0131..fe4bb3e14 100644 --- a/settings/sessioneditor.h +++ b/settings/sessioneditor.h @@ -27,13 +27,21 @@ #include #include -#include "sessiondialog.h" +#include "ui_sessiondialog.h" + +class SessionDialog : public QWidget, public Ui::SessionDialog +{ +public: + SessionDialog( QWidget *parent ) : QWidget( parent ) { + setupUi( this ); + } +}; class SessionEditor : public SessionDialog { Q_OBJECT public: - SessionEditor(QWidget* parent=0, const char *name=0); + SessionEditor(QWidget* parent=0); ~SessionEditor(); bool isModified() const { return sesMod; }