[Uml-devel] KDE/kdesdk/umbrello/umbrello
Rafael Fernández López
ereslibre at kde.org
Wed Aug 27 15:43:01 UTC 2008
SVN commit 853351 by ereslibre:
Correctly make the toolbars & docks be restored through kdelibs
M +0 -5 umbrello.kcfg
M +5 -9 uml.cpp
--- trunk/KDE/kdesdk/umbrello/umbrello/umbrello.kcfg #853350:853351
@@ -14,11 +14,6 @@
<whatisthis>Geometry</whatisthis>
<default></default>
</entry>
- <entry name="DockConfig" type="String">
- <label>DockConfig</label>
- <whatisthis>The Configuration of the Dock Widgets</whatisthis>
- <default></default>
- </entry>
<entry name="imageMimeType" type="String">
<label>Image Mime Type</label>
<whatisthis>The Mime Type of the Images</whatisthis>
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #853350:853351
@@ -131,7 +131,9 @@
// call this here because the statusBar is shown/hidden by setupGUI()
initStatusBar();
// use the absolute path to your umbrelloui.rc file for testing purpose in setupGUI();
- setupGUI();
+ StandardWindowOptions opt = Default;
+ opt &= ~Save;
+ setupGUI( opt );
initView();
initClip();
readOptions();
@@ -160,6 +162,8 @@
m_refactoringAssist = NULL;
m_commoncodegenpolicy = new CodeGenerationPolicy();
m_imageExporterAll = new UMLViewImageExporterAll();
+
+ setAutoSaveSettings();
}
UMLApp::~UMLApp()
@@ -660,10 +664,6 @@
tabifyDockWidget(m_documentationDock, m_cmdHistoryDock);
//tabifyDockWidget(m_cmdHistoryDock, m_propertyDock);
-
- QByteArray dockConfig;
- dockConfig += UmbrelloSettings::dockConfig().toAscii();
- restoreState(dockConfig); //reposition all the DockWindows to their saved positions
}
void UMLApp::openDocumentFile(const KUrl& url)
@@ -862,8 +862,6 @@
bool UMLApp::queryClose()
{
- QByteArray dockConfig = saveState();
- UmbrelloSettings::setDockConfig( dockConfig );
return m_doc->saveModified();
}
@@ -1054,8 +1052,6 @@
{
slotStatusMsg(i18n("Exiting..."));
if (m_doc->saveModified()) {
- QByteArray dockConfig = saveState();
- UmbrelloSettings::setDockConfig( dockConfig );
saveOptions();
qApp->quit();
}
More information about the umbrello-devel
mailing list