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

List:       kde-commits
Subject:    playground/pim/kcall
From:       Tobias Hunger <tobias.hunger () basyskom ! de>
Date:       2007-07-29 17:41:30
Message-ID: 1185730890.760127.5933.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 693982 by hunger:

* Fix dtmf input action and add it into the Tools menu.


 M  +0 -28     CMakeLists.txt  
 M  +3 -2      kcall/CMakeLists.txt  
 D             kcall/kcall.rc  
 D             kcall/kcall_part.rc  
 A             kcall/kcall_partui.rc   kcall/kcall_part.rc#692296
 M  +5 -7      kcall/kcallcore.cpp  
 M  +5 -5      kcall/kcallmainwindow.cpp  
 A             kcall/kcallui.rc   kcall/kcall.rc#692296
 M  +0 -2      kcall/main.cpp  


--- trunk/playground/pim/kcall/CMakeLists.txt #693981:693982
@@ -35,40 +35,12 @@
 
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
-# Suffix for x86/x86_64:
-SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-
-SET(LIB_INSTALL_DIR
-    "lib${LIB_SUFFIX}"
-    CACHE PATH "The subdirectory relative to the install prefix where libraries will \
                be installed (default is lib${LIB_SUFFIX})."
-    FORCE
-)
-
-SET(DATA_INSTALL_DIR
-    "share"
-    CACHE PATH "The subdirectory relative to the install prefix where shared data \
                will be installed (default is share)."
-    FORCE
-)
-
 SET(COMPONENT_SEARCH_DIR
     "${DATA_INSTALL_DIR}/Decibel/components"
     CACHE PATH "The subdirectory relative to the install prefix where Decibel will \
look for its components (default is ${DATA_INSTALL_DIR}/Decibel/components)."  FORCE
 )
 
-SET(DBUS_SERVICES_INSTALL_DIR
-    "${DATA_INSTALL_DIR}/dbus-1/services"
-    CACHE PATH "D-Bus services directory (default is \
                ${DATA_INSTALL_DIR}/dbus-1/services)."
-    FORCE
-)
-
-SET(DOC_INSTALL_DIR
-    "${DATA_INSTALL_DIR}/doc/kcall"
-    CACHE PATH "The subdirectory relative to the install prefix for documentation \
                files (default is ${DATA_INSTALL_DIR}/doc/Decibel)."
-    FORCE
-)
-
-
 ADD_SUBDIRECTORY(kcall)
 ADD_SUBDIRECTORY(applet) 
 
--- trunk/playground/pim/kcall/kcall/CMakeLists.txt #693981:693982
@@ -111,9 +111,10 @@
 
 
 INSTALL(FILES kcall.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-INSTALL(FILES kcall.rc kcall_part.rc DESTINATION ${DATA_INSTALL_DIR}/kcall)
+INSTALL(FILES kcallui.rc kcall_partui.rc
+        DESTINATION ${DATA_INSTALL_DIR}/kcall
+)
 
-
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR}
 )
--- trunk/playground/pim/kcall/kcall/kcallcore.cpp #693981:693982
@@ -54,7 +54,7 @@
     m_decibelChannelHandler(new DecibelChannelHandler(this)),
     m_historyModel(new HistoryModel(this, this)),
     m_callModel(new CallModel(this, this)),
-    m_dtmfInput(new DTMFInput(this, parent)),
+    m_dtmfInput(new DTMFInput(this, 0)),
     m_guiClient( client )
 {
     Decibel::registerTypes();
@@ -82,8 +82,7 @@
 }
 
 KCallCore::~KCallCore()
-{
-}
+{ delete m_dtmfInput; }
 
 bool KCallCore::newCall(const QString& /* number */)
 {
@@ -93,7 +92,7 @@
 
 KAboutData *KCallCore::createAboutData()
 {
-    KAboutData *about = new KAboutData( "KCall", 0, ki18n( "KCall" ),
+    KAboutData *about = new KAboutData( "kcall", 0, ki18n( "KCall" ),
                                         "0.7.0",
                                         ki18n( "The KCall phone application"),
                                         KAboutData::License_GPL_V2,
@@ -255,9 +254,9 @@
     action->setShortcut(Qt::CTRL + Qt::Key_D);
     connect(action, SIGNAL(triggered(bool)),
             this, SLOT(showDTMFInput()));
-    actionCollection()->addAction("dtmp_input", action);
+    actionCollection()->addAction("dtmf_input", action);
+    kDebug() << "Action \"dtmf_input\" set up." << endl;
 
-
   // file menu
 /*    mActionMail = coll->addAction( "file_mail" );
     mActionMail->setIcon( KIcon("mail-send") );
@@ -302,7 +301,6 @@
             "Clears the content of the quick search bar." ) );
 */
 //    clipboardDataChanged();
-    showDTMFInput();
 }
 
 
--- trunk/playground/pim/kcall/kcall/kcallmainwindow.cpp #693981:693982
@@ -47,15 +47,15 @@
   // modal subdialogs will only affect this dialog, not the other windows
     setAttribute( Qt::WA_GroupLeader );
 
-    setCaption( i18n( "KCall" ) );
+    setCaption(i18n("KCall"));
 
     mCore = new KCallCore( this, true, this, file );
     mCore->restoreSettings();
 
+    setCentralWidget( mCore->widget() );
+
     initActions();
 
-    setCentralWidget( mCore->widget() );
-
     statusBar()->show();
     statusBar()->insertItem( "", 1 );
 
@@ -63,11 +63,11 @@
 
     setStandardToolBarMenuEnabled( true );
 
-    createGUI( "kcall.rc" );
-
     resize( 400, 300 ); // initial size
     setAutoSaveSettings();
 
+    setupGUI();
+
     new CoreAdaptor( this );
     QDBusConnection::sessionBus().registerObject("/KCall", this, \
QDBusConnection::ExportAdaptors);  }
--- trunk/playground/pim/kcall/kcall/main.cpp #693981:693982
@@ -42,8 +42,6 @@
 #include "kcall_options.h"
 #include "kcallcore.h"
 
-
-
 class KCallApp : public KUniqueApplication {
   public:
     KCallApp() : mMainWin( 0 ), mDefaultIsOpen( false ) {}


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