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

[Sharan Rao]

SVN commit 658675 by sharan:

removed the `tip of the day`



 M  +0 -1      CMakeLists.txt  
 M  +2 -8      dialogs/settingsdlg.cpp  
 M  +0 -1      dialogs/settingsdlg.h  
 M  +1 -5      main.cpp  
 M  +0 -1      optionstate.h  
 D             tips  
 M  +4 -17     uml.cpp  
 M  +0 -6      uml.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #658674:658675
@@ -393,7 +393,6 @@
 
 install( FILES umbrello.desktop  DESTINATION  ${XDG_APPS_DIR} )
 install( FILES
-  tips
   umbrelloui.rc
   docgenerators/xmi2docbook.xsl
   docgenerators/docbook2xhtml.xsl
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #658674:658675
@@ -188,13 +188,9 @@
     startupLayout -> setSpacing( spacingHint() );
     startupLayout -> setMargin( fontMetrics().height() );
 
-    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, 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, 0, 1 );
+    startupLayout -> addWidget( m_GeneralWidgets.loadlastCB, 0, 0 );
 
     m_GeneralWidgets.startL = new QLabel( i18n("Start new project with:"), m_GeneralWidgets.startupGB );
     startupLayout -> addWidget( m_GeneralWidgets.startL, 1, 0 );
@@ -377,7 +373,6 @@
         m_GeneralWidgets.autosaveCB -> setChecked( false );
         m_GeneralWidgets.timeISB -> setValue( 5 );
         m_GeneralWidgets.timeISB->setEnabled( true );
-        m_GeneralWidgets.tipCB -> setChecked( true );
         m_GeneralWidgets.loadlastCB -> setChecked( true );
         m_GeneralWidgets.diagramKB -> setCurrentIndex( 0 );
     }
@@ -422,8 +417,7 @@
         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.tip = m_GeneralWidgets.tipCB -> isChecked();
-        m_pOptionState->generalState.loadlast = m_GeneralWidgets.loadlastCB -> isChecked();
+	m_pOptionState->generalState.loadlast = m_GeneralWidgets.loadlastCB -> isChecked();
         m_pOptionState->generalState.diagram  = (Uml::Diagram_Type)(m_GeneralWidgets.diagramKB->currentItem() + 1);
     }
     else if ( item == pageFont )
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.h #658674:658675
@@ -104,7 +104,6 @@
         QCheckBox * angularLinesCB;
         QCheckBox * footerPrintingCB;
         QCheckBox * autosaveCB;
-        QCheckBox * tipCB;
         QCheckBox * loadlastCB;
 
         // 2004-05-17 Achim Spangler: Allow definition of Suffix for autosave
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #658674:658675
@@ -106,11 +106,7 @@
         }
         uml->initGenerator();
 
-        //show tips if wanted
-        if (showGUI) {
-            KTipDialog::showTip();
-        }
-
+        
         initDocument(args, cfg);
 
         // export option
--- trunk/KDE/kdesdk/umbrello/umbrello/optionstate.h #658674:658675
@@ -39,7 +39,6 @@
     int time;        //old autosave time, kept for compatibility
     int autosavetime;
     QString autosavesuffix;  ///< Text input field for suffix of autosave
-    bool tip;
     bool loadlast;
     Uml::Diagram_Type diagram;
     QString lastFile;
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #658674:658675
@@ -395,8 +395,6 @@
     zoom100Action->setText(i18n("Z&oom to 100%"));
     connect(zoom100Action, SIGNAL( triggered( bool ) ), this, SLOT( slotZoom100() ));
 
-    KStandardAction::tipOfDay( this, SLOT( tipOfTheDay() ), actionCollection() );
-
     QString moveTabLeftString = i18n("&Move Tab Left");
     QString moveTabRightString = i18n("&Move Tab Right");
     moveTabLeft = actionCollection()->addAction("move_tab_left");
@@ -644,8 +642,6 @@
     }
     cg.writeEntry( "imageMimeType", getImageMimeType() );
 
-    cg.changeGroup( "TipOfDay");
-    cg.writeEntry( "RunOnStart", optionState.generalState.tip );
 
     cg.changeGroup( "UI Options" );
     cg.writeEntry( "useFillColor", optionState.uiState.useFillColor );
@@ -1114,11 +1110,9 @@
 }
 
 void UMLApp::slotPrefs() {
-    /* the KTipDialog may have changed the value */
-    const KConfigGroup tipConfig( m_config, "TipOfDay");
+   
     Settings::OptionState& optionState = Settings::getOptionState();
-    optionState.generalState.tip = tipConfig.readEntry( "RunOnStart", true );
-
+  
     m_dlg = new SettingsDlg(this, &optionState);
     connect(m_dlg, SIGNAL( applyClicked() ), this, SLOT( slotApplyPrefs() ) );
 
@@ -1133,10 +1127,9 @@
 void UMLApp::slotApplyPrefs() {
     if (m_dlg) {
         /* we need this to sync both values */
-        KConfigGroup tipConfig( m_config, "TipOfDay");
+      
         Settings::OptionState& optionState = Settings::getOptionState();
-        tipConfig.writeEntry( "RunOnStart", optionState.generalState.tip );
-
+      
         m_doc -> settingsChanged( optionState );
         const QString plStr = m_dlg->getCodeGenerationLanguage();
         Uml::Programming_Language pl = Model_Utils::stringToProgLang(plStr);
@@ -1206,8 +1199,6 @@
 
     optionState.generalState.diagram  = (Uml::Diagram_Type) generalGroup.readEntry("diagram", 1);
 
-    const KConfigGroup tipGroup( m_config, "TipOfDay" );
-    optionState.generalState.tip = tipGroup.readEntry( "RunOnStart", true );
 
     const KConfigGroup uiGroup( m_config, "UI Options" );
     optionState.uiState.useFillColor = uiGroup.readEntry( "useFillColor", true );
@@ -1643,10 +1634,6 @@
     }
 }
 
-void UMLApp::tipOfTheDay()
-{
-    KTipDialog::showTip(this ,QString::null, true);
-}
 
 void UMLApp::keyPressEvent(QKeyEvent *e) {
     switch(e->key()) {
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.h #658674:658675
@@ -457,13 +457,7 @@
 
     void setProgLangMenu(Uml::Programming_Language pl);
 
-protected slots:
 
-    /**
-     * Show "Tip of the Day" dialog
-     */
-    void tipOfTheDay();
-
 public slots:
 
     /**