Diffstat (limited to 'microkde/kresources/configdialog.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | microkde/kresources/configdialog.cpp | 78 |
1 files changed, 62 insertions, 16 deletions
diff --git a/microkde/kresources/configdialog.cpp b/microkde/kresources/configdialog.cpp index 90febca..f8240f9 100644 --- a/microkde/kresources/configdialog.cpp +++ b/microkde/kresources/configdialog.cpp | |||
@@ -31,4 +31,6 @@ | |||
31 | #include <qpushbutton.h> | 31 | #include <qpushbutton.h> |
32 | #include <qvbox.h> | ||
32 | 33 | ||
33 | #include <qcheckbox.h> | 34 | #include <qcheckbox.h> |
35 | #include <qscrollview.h> | ||
34 | 36 | ||
@@ -48,3 +50,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
48 | : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ), | 50 | : KDialogBase( parent, name, true, resource->isSyncable()?i18n( "Sync Profile Configuration" ):i18n( "Resource Configuration" ), |
49 | Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget(0), mResource( resource ), mPersistentReadOnly(false) | 51 | Ok|Cancel, Ok, true )/*, mConfig( config )*/, mSyncWidget_Settings(0), mSyncWidget_Conflicts(0),mSyncWidget_Remote(0), mResource( resource ), mPersistentReadOnly(false) |
50 | { | 52 | { |
@@ -56,4 +58,8 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
56 | 58 | ||
57 | //US QFrame *main = makeMainWidget(); | 59 | QFrame *main; |
58 | QFrame *main = plainPage(); | 60 | |
61 | if (!mResource->isSyncable()) | ||
62 | main = plainPage(); | ||
63 | else | ||
64 | main = addPage("Profile"); | ||
59 | 65 | ||
@@ -61,2 +67,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
61 | 67 | ||
68 | |||
62 | QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main ); | 69 | QGroupBox *generalGroupBox = new QGroupBox( 2, Qt::Horizontal, main ); |
@@ -100,10 +107,43 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
100 | { | 107 | { |
101 | QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal, main ); | 108 | SyncWidgetContainer* c = factory->syncWidgetContainer( resource->type() ); |
102 | syncGroupBox->layout()->setSpacing( spacingHint()); | ||
103 | syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) ); | ||
104 | mainLayout->addWidget( syncGroupBox ); | ||
105 | 109 | ||
106 | mainLayout->addStretch(); | 110 | QFrame* syncPage = addPage("Settings"); |
111 | QVBoxLayout *syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
112 | mSyncWidget_Settings = c->generateSettingsTab(syncPage); | ||
113 | syncLayout->addWidget( mSyncWidget_Settings ); | ||
114 | |||
115 | syncPage = addPage("Conflicts"); | ||
116 | syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
117 | mSyncWidget_Conflicts = c->generateConflictsTab(syncPage); | ||
118 | syncLayout->addWidget( mSyncWidget_Conflicts ); | ||
119 | |||
120 | syncPage = addPage("Remote"); | ||
121 | syncLayout = new QVBoxLayout( syncPage, 0, spacingHint() ); | ||
122 | mSyncWidget_Remote = c->generateRemoteTab(syncPage); | ||
123 | syncLayout->addWidget( mSyncWidget_Remote ); | ||
124 | |||
125 | |||
126 | mSyncWidget_Settings->setInEditMode( false ); | ||
127 | mSyncWidget_Settings->loadSettings( mResource ); | ||
128 | mSyncWidget_Settings->show(); | ||
107 | 129 | ||
108 | mSyncWidget = factory->syncWidget( resource->type(), syncGroupBox ); | 130 | mSyncWidget_Conflicts->setInEditMode( false ); |
131 | mSyncWidget_Conflicts->loadSettings( mResource ); | ||
132 | mSyncWidget_Conflicts->show(); | ||
133 | |||
134 | mSyncWidget_Remote->setInEditMode( false ); | ||
135 | mSyncWidget_Remote->loadSettings( mResource ); | ||
136 | mSyncWidget_Remote->show(); | ||
137 | |||
138 | delete c; | ||
139 | |||
140 | // QGroupBox *syncGroupBox = new QGroupBox( 2, Qt::Horizontal, syncPage ); | ||
141 | // syncGroupBox->layout()->setSpacing( spacingHint()); | ||
142 | // syncGroupBox->setTitle( i18n( "Syncronize Preferences" ) ); | ||
143 | // syncLayout->addWidget( syncGroupBox ); | ||
144 | |||
145 | // syncLayout->addStretch(); | ||
146 | /*US | ||
147 | mSyncWidget = factory->syncWidget( resource->type(), syncPage ); | ||
148 | syncLayout->addWidget( mSyncWidget ); | ||
109 | if ( mSyncWidget ) { | 149 | if ( mSyncWidget ) { |
@@ -113,2 +153,3 @@ ConfigDialog::ConfigDialog( QWidget *parent, const QString& resourceFamily, | |||
113 | } | 153 | } |
154 | */ | ||
114 | } | 155 | } |
@@ -133,4 +174,8 @@ void ConfigDialog::setInEditMode( bool value ) | |||
133 | 174 | ||
134 | if ( mSyncWidget ) | 175 | if ( mSyncWidget_Settings ) |
135 | mSyncWidget->setInEditMode( value ); | 176 | mSyncWidget_Settings->setInEditMode( value ); |
177 | if ( mSyncWidget_Conflicts ) | ||
178 | mSyncWidget_Conflicts->setInEditMode( value ); | ||
179 | if ( mSyncWidget_Remote ) | ||
180 | mSyncWidget_Remote->setInEditMode( value ); | ||
136 | 181 | ||
@@ -184,7 +229,8 @@ void ConfigDialog::accept() | |||
184 | 229 | ||
185 | if ( mSyncWidget ) { | 230 | if ( mSyncWidget_Settings ) |
186 | // First save generic information | 231 | mSyncWidget_Settings->saveSettings( mResource ); |
187 | // Also save setting of specific resource type | 232 | if ( mSyncWidget_Conflicts ) |
188 | mSyncWidget->saveSettings( mResource ); | 233 | mSyncWidget_Conflicts->saveSettings( mResource ); |
189 | } | 234 | if ( mSyncWidget_Remote ) |
235 | mSyncWidget_Remote->saveSettings( mResource ); | ||
190 | 236 | ||