[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Sharan Rao]

SVN commit 656656 by sharan:

Removed the Splash Screen



 M  +0 -1      CMakeLists.txt  
 M  +4 -10     dialogs/settingsdlg.cpp  
 M  +0 -1      dialogs/settingsdlg.h  
 M  +3 -34     main.cpp  
 M  +0 -1      optionstate.h  
 M  +0 -2      uml.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #656655:656656
@@ -301,7 +301,6 @@
    hierarchicalcodeblock.cpp 
    import_rose.cpp 
    kplayerslideraction.cpp
-   kstartuplogo.cpp 
    linepath.cpp 
    linkwidget.cpp 
    listpopupmenu.cpp 
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #656655:656656
@@ -188,24 +188,20 @@
     startupLayout -> setSpacing( spacingHint() );
     startupLayout -> setMargin( fontMetrics().height() );
 
-    m_GeneralWidgets.logoCB = new QCheckBox( i18n("Sta&rtup logo"), m_GeneralWidgets.startupGB );
-    m_GeneralWidgets.logoCB -> setChecked( m_pOptionState->generalState.logo );
-    startupLayout -> addWidget( m_GeneralWidgets.logoCB, 0, 0 );
-
     m_GeneralWidgets.tipCB = new QCheckBox( i18n("&Tip of the day"), m_GeneralWidgets.startupGB );
     m_GeneralWidgets.tipCB -> setChecked( m_pOptionState->generalState.tip );
-    startupLayout -> addWidget( m_GeneralWidgets.tipCB, 0, 1 );
+    startupLayout -> addWidget( m_GeneralWidgets.tipCB, 0, 0 );
 
     m_GeneralWidgets.loadlastCB = new QCheckBox( i18n("&Load last project"), m_GeneralWidgets.startupGB );
     m_GeneralWidgets.loadlastCB -> setChecked( m_pOptionState->generalState.loadlast );
-    startupLayout -> addWidget( m_GeneralWidgets.loadlastCB, 1, 0 );
+    startupLayout -> addWidget( m_GeneralWidgets.loadlastCB, 0, 1 );
 
     m_GeneralWidgets.startL = new QLabel( i18n("Start new project with:"), m_GeneralWidgets.startupGB );
-    startupLayout -> addWidget( m_GeneralWidgets.startL, 2, 0 );
+    startupLayout -> addWidget( m_GeneralWidgets.startL, 1, 0 );
 
     m_GeneralWidgets.diagramKB = new KComboBox( m_GeneralWidgets.startupGB );
     m_GeneralWidgets.diagramKB->setCompletionMode( KGlobalSettings::CompletionPopup );
-    startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 2, 1 );
+    startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 1, 1 );
 
     QString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"),
                             i18n("Use Case Diagram"), i18n("Sequence Diagram"),
@@ -381,7 +377,6 @@
         m_GeneralWidgets.autosaveCB -> setChecked( false );
         m_GeneralWidgets.timeISB -> setValue( 5 );
         m_GeneralWidgets.timeISB->setEnabled( true );
-        m_GeneralWidgets.logoCB -> setChecked( true );
         m_GeneralWidgets.tipCB -> setChecked( true );
         m_GeneralWidgets.loadlastCB -> setChecked( true );
         m_GeneralWidgets.diagramKB -> setCurrentIndex( 0 );
@@ -427,7 +422,6 @@
         m_pOptionState->generalState.autosavetime = m_GeneralWidgets.timeISB -> value();
         // 2004-05-17 Achim Spangler: retrieve Suffix setting from dialog entry
         m_pOptionState->generalState.autosavesuffix = m_GeneralWidgets.autosaveSuffixT -> text();
-        m_pOptionState->generalState.logo = m_GeneralWidgets.logoCB -> isChecked();
         m_pOptionState->generalState.tip = m_GeneralWidgets.tipCB -> isChecked();
         m_pOptionState->generalState.loadlast = m_GeneralWidgets.loadlastCB -> isChecked();
         m_pOptionState->generalState.diagram  = (Uml::Diagram_Type)(m_GeneralWidgets.diagramKB->currentItem() + 1);
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.h #656655:656656
@@ -104,7 +104,6 @@
         QCheckBox * angularLinesCB;
         QCheckBox * footerPrintingCB;
         QCheckBox * autosaveCB;
-        QCheckBox * logoCB;
         QCheckBox * tipCB;
         QCheckBox * loadlastCB;
 
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #656655:656656
@@ -26,8 +26,8 @@
 #include "version.h"
 #include "umldoc.h"
 #include "cmdlineexportallviewsevent.h"
-#include "kstartuplogo.h"
 
+
 static const char description[] =
     I18N_NOOP("Umbrello UML Modeller");
 // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE
@@ -53,16 +53,6 @@
  */
 bool getShowGUI(KCmdLineArgs *args);
 
-/**
- * Creates, shows and returns the startup logo for the application if it should be shown,
- * else returns null pointer.
- * The startup logo is shown if it is configured to be shown and also the GUI must be shown.
- *
- * @param cfg The application configuration.
- * @param showGUI If the GUI should be shown.
- * @return The startup logo for the application, or a null pointer if it shouldn't be shown.
- */
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI);
 
 /**
  * Initializes the document used by the application.
@@ -110,8 +100,7 @@
         flushEvents();
         KConfig * cfg = app.sessionConfig();
 
-        KStartupLogo* startLogo = showStartupLogo(cfg, showGUI);
-
+       
         if (showGUI) {
             uml->show();
         }
@@ -130,9 +119,7 @@
              exportAllViews(args, exportOpt);
         }
 
-        if ( showGUI && (startLogo != 0L) && !startLogo->isHidden() ) {
-            startLogo->raise();
-        }
+       
     }
     return app.exec();
 }
@@ -145,25 +132,7 @@
     return true;
 }
 
-KStartupLogo* showStartupLogo(KConfig* cfg, bool showGUI) {
-    KStartupLogo* startLogo = 0L;
 
-    cfg->setGroup( "General Options" );
-    bool showLogo = cfg->readEntry( "logo", true );
-    if (showGUI && showLogo) {
-        startLogo = new KStartupLogo(0);
-        startLogo->setHideEnabled(true);
-#ifdef Q_OS_UNIX
-        KWM::setMainWindow(startLogo, UMLApp::app()->winId());
-        KWM::setState(startLogo->winId(), NET::KeepAbove);
-#endif
-        startLogo->show();
-        QApplication::flush();
-    }
-
-    return startLogo;
-}
-
 void initDocument(KCmdLineArgs *args, KConfig* cfg) {
     if ( args -> count() ) {
         UMLApp::app()->openDocumentFile( args->url( 0 ) );
--- trunk/KDE/kdesdk/umbrello/umbrello/optionstate.h #656655:656656
@@ -39,7 +39,6 @@
     int time;        //old autosave time, kept for compatibility
     int autosavetime;
     QString autosavesuffix;  ///< Text input field for suffix of autosave
-    bool logo;
     bool tip;
     bool loadlast;
     Uml::Diagram_Type diagram;
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #656655:656656
@@ -635,7 +635,6 @@
     cg.writeEntry( "autosavetime", optionState.generalState.autosavetime );
     cg.writeEntry( "autosavesuffix", optionState.generalState.autosavesuffix );
 
-    cg.writeEntry( "logo", optionState.generalState.logo );
     cg.writeEntry( "loadlast", optionState.generalState.loadlast );
 
     cg.writeEntry( "diagram", (int)optionState.generalState.diagram );
@@ -1204,7 +1203,6 @@
     // 2004-05-17 Achim Spangler: read new config entry for autosave sufix
     optionState.generalState.autosavesuffix = generalGroup.readEntry( "autosavesuffix", ".xmi" );
 
-    optionState.generalState.logo = generalGroup.readEntry( "logo", true );
     optionState.generalState.loadlast = generalGroup.readEntry( "loadlast", true );
 
     optionState.generalState.diagram  = (Uml::Diagram_Type) generalGroup.readEntry("diagram", 1);