[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/knotes
From:       Michael Brade <brade () kde ! org>
Date:       2005-01-16 21:59:45
Message-ID: 20050116215945.E5B481CEB4 () office ! kde ! org
[Download RAW message or body]

CVS commit by brade: 

Read the most recent instead of always taking the local knotesui.rc file.
This way an updated KNotes installation is actually reflected in the note UI
in case it changed.


  M +4 -0      ChangeLog   1.97
  M +9 -3      knotesapp.cpp   1.111


--- kdepim/knotes/knotesapp.cpp  #1.110:1.111
@@ -130,7 +130,13 @@ KNotesApp::KNotesApp()
     m_note_menu = static_cast<KPopupMenu*>(m_guiFactory->container( "notes_menu", this ));
 
-    m_noteGUI.setContent(
-        KXMLGUIFactory::readConfigFile( instance()->instanceName() + "ui.rc", instance() )
-    );
+    // get the most recent XML UI file
+    QString xmlFileName = instance()->instanceName() + "ui.rc";
+    QString filter = QString::fromLatin1( instance()->instanceName() + '/' ) + xmlFileName;
+    QStringList fileList = instance()->dirs()->findAllResources( "data", filter ) +
+                           instance()->dirs()->findAllResources( "data", xmlFileName );
+
+    QString doc;
+    KXMLGUIClient::findMostRecentXMLFile( fileList, doc );
+    m_noteGUI.setContent( doc );
 
     // create accels for global shortcuts

--- kdepim/knotes/ChangeLog  #1.96:1.97
@@ -2,4 +2,8 @@
 ====================
 
+2005/01/16  Michael Brade <brade@kde.org>
+
+    * read the most recent instead of always taking the local knotesui.rc file
+
 2005/01/09  Michael Brade <brade@kde.org>
 


[prev in list] [next in list] [prev in thread] [next in thread]