From 2fa69303422fa5d9e4ffc87360924f5bb72debd1 Mon Sep 17 00:00:00 2001 From: Sudheer K Date: Sun, 22 Jan 2012 20:35:49 -0800 Subject: [PATCH] Release version 0.7-0 --- qtc_packaging/debian_fremantle/changelog | 2 +- qtc_packaging/debian_fremantle/rules | 39 ++-- qtc_packaging/debian_fremantle/vicar.substvars | 3 +- qtc_packaging/debian_harmattan/changelog | 2 +- qtc_packaging/debian_harmattan/postinst_DONTUSE | 71 ------- qtc_packaging/debian_harmattan/rules | 4 +- qtc_packaging/debian_harmattan/vicar.aegis | 25 --- src/vicar-config/uis/ui_profilesettingsdialog.h | 224 ----------------------- src/vicar-config/uis/ui_profileswindow.h | 146 --------------- src/vicar-utils/cpp/main.cpp | 41 ++--- 10 files changed, 41 insertions(+), 516 deletions(-) delete mode 100644 qtc_packaging/debian_harmattan/manifest.aegis_old delete mode 100644 qtc_packaging/debian_harmattan/postinst_DONTUSE delete mode 100644 src/vicar-config/uis/ui_profilesettingsdialog.h delete mode 100644 src/vicar-config/uis/ui_profileswindow.h diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog index 4719d11..a18a0f9 100755 --- a/qtc_packaging/debian_fremantle/changelog +++ b/qtc_packaging/debian_fremantle/changelog @@ -1,5 +1,5 @@ vicar (0.7-0maemo5) unstable; urgency=low * Added Harmattan support - -- Sudheer K. Mon, 22 Aug 2011 16:10:00 -0800 + -- Sudheer K. Sun, 22 Jan 2012 16:10:00 -0800 diff --git a/qtc_packaging/debian_fremantle/rules b/qtc_packaging/debian_fremantle/rules index 46da245..1278b97 100755 --- a/qtc_packaging/debian_fremantle/rules +++ b/qtc_packaging/debian_fremantle/rules @@ -9,36 +9,31 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +APPNAME := vicar +builddir: + mkdir -p builddir - - - -configure: configure-stamp -configure-stamp: - dh_testdir - # qmake PREFIX=/usr# Uncomment this line for use without Qt Creator - - touch configure-stamp - +builddir/Makefile: builddir + cd builddir && qmake ../$(APPNAME).pro build: build-stamp -build-stamp: configure-stamp +build-stamp: builddir/Makefile dh_testdir # Add here commands to compile the package. - # $(MAKE) # Uncomment this line for use without Qt Creator - #docbook-to-man debian/vicar.sgml > vicar.1 + cd builddir && $(MAKE) + #docbook-to-man debian/$(APPNAME).sgml > $(APPNAME).1 touch $@ -clean: +clean: dh_testdir dh_testroot - rm -f build-stamp configure-stamp + rm -f build-stamp # Add here commands to clean up after the build process. - $(MAKE) clean + rm -rf builddir dh_clean @@ -48,8 +43,8 @@ install: build dh_clean -k dh_installdirs - # Add here commands to install the package into debian/vicar. - $(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/vicar install + # Add here commands to install the package into debian/arora. + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install # Build architecture-independent files here. @@ -62,7 +57,7 @@ binary-arch: build install dh_testroot dh_installchangelogs dh_installdocs - dh_installexamples +# dh_installexamples # dh_install # dh_installmenu # dh_installdebconf @@ -74,15 +69,15 @@ binary-arch: build install # dh_installinit # dh_installcron # dh_installinfo - dh_installman +# dh_installman dh_link - dh_strip + dh_strip #Uncomment to remove debug symbols dh_compress dh_fixperms # dh_perl # dh_makeshlibs dh_installdeb - # dh_shlibdeps # Uncomment this line for use without Qt Creator + dh_shlibdeps # Uncomment this line for use without Qt Creator dh_gencontrol dh_md5sums dh_builddeb diff --git a/qtc_packaging/debian_fremantle/vicar.substvars b/qtc_packaging/debian_fremantle/vicar.substvars index 2d4bfa9..7c973b0 100644 --- a/qtc_packaging/debian_fremantle/vicar.substvars +++ b/qtc_packaging/debian_fremantle/vicar.substvars @@ -1 +1,2 @@ -shlibs:Depends=libc6 (>= 2.5.0-1), libgcc1 (>= 1:4.2.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.20.0), libqt4-core (>= 4.7.0~git20100909), libqt4-dbus (>= 4.7.0~git20100909), libqt4-gui (>= 4.7.0~git20100909), libqt4-sql (>= 4.7.0~git20100909), libqt4-xml (>= 4.7.0~git20100909), libstdc++6 (>= 4.2.1) +shlibs:Depends=libc6 (>= 2.5.0-1), libdbus-1-3 (>= 1.1.4), libdbus-glib-1-2 (>= 0.76), libgcc1 (>= 1:4.2.1), libgconf2-6 (>= 2.13.5), libglib2.0-0 (>= 2.20.0), libqt4-core (>= 4.7.0~git20100909), libqt4-dbus (>= 4.7.0~git20100909), libqt4-gui (>= 4.7.0~git20100909), libqt4-sql (>= 4.7.0~git20100909), libqt4-xml (>= 4.7.0~git20100909), libstdc++6 (>= 4.2.1) +misc:Depends= diff --git a/qtc_packaging/debian_harmattan/changelog b/qtc_packaging/debian_harmattan/changelog index 79cdd4a..219a901 100755 --- a/qtc_packaging/debian_harmattan/changelog +++ b/qtc_packaging/debian_harmattan/changelog @@ -1,5 +1,5 @@ vicar (0.7-0maemo6) unstable; urgency=low * Added Harmattan support - -- Sudheer K. Mon, 22 Aug 2011 16:10:00 -0800 + -- Sudheer K. Sun, 22 Jan 2012 16:10:00 -0800 diff --git a/qtc_packaging/debian_harmattan/manifest.aegis_old b/qtc_packaging/debian_harmattan/manifest.aegis_old deleted file mode 100644 index e69de29..0000000 diff --git a/qtc_packaging/debian_harmattan/postinst_DONTUSE b/qtc_packaging/debian_harmattan/postinst_DONTUSE deleted file mode 100644 index e608d4c..0000000 --- a/qtc_packaging/debian_harmattan/postinst_DONTUSE +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# postinst script for vicar -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - - eval $(dbus-launch --sh-syntax) - export DBUS_SESSION_BUS_ADDRESS - export DBUS_SESSION_BUS_PID - - # Kill any running instances of the daemon (only used on Linux based systems) - #killall -q vicar-daemon || true - #killall -q vicar-telepathy || true - - echo "Checking for log folder ..." - [[ ! -d /var/log/vicar ]] && mkdir /var/log/vicar - - echo "Checking for log file ..." - [[ ! -e /var/log/vicar/vicar.log ]] && touch /var/log/vicar/vicar.log && chown -R user:users /var/log/vicar - - echo "Starting Vicar daemon ..." - #[[ -x /opt/vicar/bin/vicar-daemon ]] && su - user -c "exec /opt/vicar/bin/vicar-daemon& >/dev/null" - - echo "Starting Vicar-Telepathy ..." - #[[ -x /opt/vicar/bin/vicar-telepathy ]] && su - user -c "exec /opt/vicar/bin/vicar-telepathy& >/dev/null" - - echo "Creating Vicar Telepathy account ..." - #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils INSTALL" - - echo "Updating permissions on Vicar DB file ..." - #[[ -e /home/user/vicar.db.sqlite ]] && chown user:users /home/user/vicar.db.sqlite - - echo "Creating Vicar Profiles database ..." - #[[ -x /opt/vicar/bin/vicar-utils ]] && su - user -c "exec /opt/vicar/bin/vicar-utils CREATEDB" - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules index b3f812f..f93fe80 100755 --- a/qtc_packaging/debian_harmattan/rules +++ b/qtc_packaging/debian_harmattan/rules @@ -27,7 +27,7 @@ build-stamp: configure-stamp dh_testdir # Add here commands to compile the package. - # $(MAKE) # Uncomment this line for use without Qt Creator + $(MAKE) # Uncomment this line for use without Qt Creator #docbook-to-man debian/vicar.sgml > vicar.1 touch $@ @@ -38,7 +38,7 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - $(MAKE) clean + $(MAKE) clean dh_clean diff --git a/qtc_packaging/debian_harmattan/vicar.aegis b/qtc_packaging/debian_harmattan/vicar.aegis index 4c310f9..eb9db67 100644 --- a/qtc_packaging/debian_harmattan/vicar.aegis +++ b/qtc_packaging/debian_harmattan/vicar.aegis @@ -7,37 +7,12 @@ contents will be updated without user interaction. Modify the file or remove the checksum to disable this functionality. --> - - - - - diff --git a/src/vicar-config/uis/ui_profilesettingsdialog.h b/src/vicar-config/uis/ui_profilesettingsdialog.h deleted file mode 100644 index 101b4c0..0000000 --- a/src/vicar-config/uis/ui_profilesettingsdialog.h +++ /dev/null @@ -1,224 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'profilesettingsdialog.ui' -** -** Created: Mon Jan 2 23:41:01 2012 -** by: Qt User Interface Compiler version 4.7.4 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_PROFILESETTINGSDIALOG_H -#define UI_PROFILESETTINGSDIALOG_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_ProfileSettingsDialog -{ -public: - QScrollArea *scrollArea; - QWidget *scrollAreaWidgetContents; - QWidget *formLayoutWidget; - QFormLayout *formLayoutBasic; - QLabel *labelNumberStartsWith; - QLineEdit *lineEditNumberStartsWith; - QLabel *labelCallingCardNumber; - QLineEdit *lineEditCallingCardNumber; - QLabel *labelDTMFFormat; - QComboBox *comboBoxDTMFFormat; - QLabel *labelDTMFPrefix; - QLineEdit *lineEditDTMFPrefix; - QLabel *labelDTMFSuffix; - QLineEdit *lineEditDTMFSuffix; - QWidget *layoutWidget; - QVBoxLayout *verticalLayout; - QPushButton *saveButton; - QSpacerItem *verticalSpacer; - QPushButton *closeButton; - - void setupUi(QDialog *ProfileSettingsDialog) - { - if (ProfileSettingsDialog->objectName().isEmpty()) - ProfileSettingsDialog->setObjectName(QString::fromUtf8("ProfileSettingsDialog")); - ProfileSettingsDialog->setWindowModality(Qt::ApplicationModal); - ProfileSettingsDialog->resize(800, 400); - ProfileSettingsDialog->setModal(true); - scrollArea = new QScrollArea(ProfileSettingsDialog); - scrollArea->setObjectName(QString::fromUtf8("scrollArea")); - scrollArea->setGeometry(QRect(0, 10, 681, 371)); - scrollArea->setWidgetResizable(true); - scrollAreaWidgetContents = new QWidget(); - scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 679, 369)); - formLayoutWidget = new QWidget(scrollAreaWidgetContents); - formLayoutWidget->setObjectName(QString::fromUtf8("formLayoutWidget")); - formLayoutWidget->setGeometry(QRect(10, 10, 661, 351)); - formLayoutBasic = new QFormLayout(formLayoutWidget); - formLayoutBasic->setObjectName(QString::fromUtf8("formLayoutBasic")); - formLayoutBasic->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayoutBasic->setContentsMargins(10, 0, 0, 0); - labelNumberStartsWith = new QLabel(formLayoutWidget); - labelNumberStartsWith->setObjectName(QString::fromUtf8("labelNumberStartsWith")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(labelNumberStartsWith->sizePolicy().hasHeightForWidth()); - labelNumberStartsWith->setSizePolicy(sizePolicy); - labelNumberStartsWith->setMinimumSize(QSize(280, 25)); - labelNumberStartsWith->setMaximumSize(QSize(280, 16777215)); - labelNumberStartsWith->setMargin(0); - - formLayoutBasic->setWidget(0, QFormLayout::LabelRole, labelNumberStartsWith); - - lineEditNumberStartsWith = new QLineEdit(formLayoutWidget); - lineEditNumberStartsWith->setObjectName(QString::fromUtf8("lineEditNumberStartsWith")); - QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Fixed); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(lineEditNumberStartsWith->sizePolicy().hasHeightForWidth()); - lineEditNumberStartsWith->setSizePolicy(sizePolicy1); - lineEditNumberStartsWith->setMinimumSize(QSize(0, 60)); - lineEditNumberStartsWith->setInputMethodHints(Qt::ImhDialableCharactersOnly|Qt::ImhLowercaseOnly|Qt::ImhNoPredictiveText|Qt::ImhPreferNumbers); - - formLayoutBasic->setWidget(0, QFormLayout::FieldRole, lineEditNumberStartsWith); - - labelCallingCardNumber = new QLabel(formLayoutWidget); - labelCallingCardNumber->setObjectName(QString::fromUtf8("labelCallingCardNumber")); - - formLayoutBasic->setWidget(1, QFormLayout::LabelRole, labelCallingCardNumber); - - lineEditCallingCardNumber = new QLineEdit(formLayoutWidget); - lineEditCallingCardNumber->setObjectName(QString::fromUtf8("lineEditCallingCardNumber")); - sizePolicy1.setHeightForWidth(lineEditCallingCardNumber->sizePolicy().hasHeightForWidth()); - lineEditCallingCardNumber->setSizePolicy(sizePolicy1); - lineEditCallingCardNumber->setMinimumSize(QSize(0, 60)); - lineEditCallingCardNumber->setInputMethodHints(Qt::ImhDialableCharactersOnly|Qt::ImhNoPredictiveText); - - formLayoutBasic->setWidget(1, QFormLayout::FieldRole, lineEditCallingCardNumber); - - labelDTMFFormat = new QLabel(formLayoutWidget); - labelDTMFFormat->setObjectName(QString::fromUtf8("labelDTMFFormat")); - sizePolicy.setHeightForWidth(labelDTMFFormat->sizePolicy().hasHeightForWidth()); - labelDTMFFormat->setSizePolicy(sizePolicy); - labelDTMFFormat->setMinimumSize(QSize(280, 25)); - labelDTMFFormat->setMaximumSize(QSize(280, 16777215)); - labelDTMFFormat->setWordWrap(true); - - formLayoutBasic->setWidget(2, QFormLayout::LabelRole, labelDTMFFormat); - - comboBoxDTMFFormat = new QComboBox(formLayoutWidget); - comboBoxDTMFFormat->setObjectName(QString::fromUtf8("comboBoxDTMFFormat")); - QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Minimum); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); - sizePolicy2.setHeightForWidth(comboBoxDTMFFormat->sizePolicy().hasHeightForWidth()); - comboBoxDTMFFormat->setSizePolicy(sizePolicy2); - comboBoxDTMFFormat->setMinimumSize(QSize(50, 60)); - - formLayoutBasic->setWidget(2, QFormLayout::FieldRole, comboBoxDTMFFormat); - - labelDTMFPrefix = new QLabel(formLayoutWidget); - labelDTMFPrefix->setObjectName(QString::fromUtf8("labelDTMFPrefix")); - - formLayoutBasic->setWidget(3, QFormLayout::LabelRole, labelDTMFPrefix); - - lineEditDTMFPrefix = new QLineEdit(formLayoutWidget); - lineEditDTMFPrefix->setObjectName(QString::fromUtf8("lineEditDTMFPrefix")); - sizePolicy1.setHeightForWidth(lineEditDTMFPrefix->sizePolicy().hasHeightForWidth()); - lineEditDTMFPrefix->setSizePolicy(sizePolicy1); - lineEditDTMFPrefix->setMinimumSize(QSize(0, 60)); - lineEditDTMFPrefix->setInputMethodHints(Qt::ImhDialableCharactersOnly|Qt::ImhLowercaseOnly|Qt::ImhNoPredictiveText|Qt::ImhPreferNumbers); - - formLayoutBasic->setWidget(3, QFormLayout::FieldRole, lineEditDTMFPrefix); - - labelDTMFSuffix = new QLabel(formLayoutWidget); - labelDTMFSuffix->setObjectName(QString::fromUtf8("labelDTMFSuffix")); - - formLayoutBasic->setWidget(4, QFormLayout::LabelRole, labelDTMFSuffix); - - lineEditDTMFSuffix = new QLineEdit(formLayoutWidget); - lineEditDTMFSuffix->setObjectName(QString::fromUtf8("lineEditDTMFSuffix")); - sizePolicy1.setHeightForWidth(lineEditDTMFSuffix->sizePolicy().hasHeightForWidth()); - lineEditDTMFSuffix->setSizePolicy(sizePolicy1); - lineEditDTMFSuffix->setMinimumSize(QSize(0, 60)); - lineEditDTMFSuffix->setInputMethodHints(Qt::ImhDialableCharactersOnly|Qt::ImhLowercaseOnly|Qt::ImhNoPredictiveText|Qt::ImhPreferNumbers); - - formLayoutBasic->setWidget(4, QFormLayout::FieldRole, lineEditDTMFSuffix); - - scrollArea->setWidget(scrollAreaWidgetContents); - layoutWidget = new QWidget(ProfileSettingsDialog); - layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); - layoutWidget->setGeometry(QRect(696, 22, 101, 124)); - verticalLayout = new QVBoxLayout(layoutWidget); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - verticalLayout->setContentsMargins(0, 0, 0, 0); - saveButton = new QPushButton(layoutWidget); - saveButton->setObjectName(QString::fromUtf8("saveButton")); - QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Fixed); - sizePolicy3.setHorizontalStretch(0); - sizePolicy3.setVerticalStretch(0); - sizePolicy3.setHeightForWidth(saveButton->sizePolicy().hasHeightForWidth()); - saveButton->setSizePolicy(sizePolicy3); - saveButton->setMinimumSize(QSize(0, 40)); - - verticalLayout->addWidget(saveButton); - - verticalSpacer = new QSpacerItem(17, 30, QSizePolicy::Minimum, QSizePolicy::Expanding); - - verticalLayout->addItem(verticalSpacer); - - closeButton = new QPushButton(layoutWidget); - closeButton->setObjectName(QString::fromUtf8("closeButton")); - closeButton->setMinimumSize(QSize(0, 40)); - - verticalLayout->addWidget(closeButton); - - - retranslateUi(ProfileSettingsDialog); - - QMetaObject::connectSlotsByName(ProfileSettingsDialog); - } // setupUi - - void retranslateUi(QDialog *ProfileSettingsDialog) - { - ProfileSettingsDialog->setWindowTitle(QApplication::translate("ProfileSettingsDialog", "Edit Profile", 0, QApplication::UnicodeUTF8)); - labelNumberStartsWith->setText(QApplication::translate("ProfileSettingsDialog", "Number starts with:", 0, QApplication::UnicodeUTF8)); - labelCallingCardNumber->setText(QApplication::translate("ProfileSettingsDialog", "Calling card number:", 0, QApplication::UnicodeUTF8)); - labelDTMFFormat->setText(QApplication::translate("ProfileSettingsDialog", "Format required for DTMF tone:", 0, QApplication::UnicodeUTF8)); - comboBoxDTMFFormat->clear(); - comboBoxDTMFFormat->insertItems(0, QStringList() - << QApplication::translate("ProfileSettingsDialog", "", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ProfileSettingsDialog", "+", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ProfileSettingsDialog", "00", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ProfileSettingsDialog", "011", 0, QApplication::UnicodeUTF8) - ); - labelDTMFPrefix->setText(QApplication::translate("ProfileSettingsDialog", "DTMF tone prefix: ", 0, QApplication::UnicodeUTF8)); - labelDTMFSuffix->setText(QApplication::translate("ProfileSettingsDialog", "DTMF tone suffix:", 0, QApplication::UnicodeUTF8)); - saveButton->setText(QApplication::translate("ProfileSettingsDialog", "Save", 0, QApplication::UnicodeUTF8)); - closeButton->setText(QApplication::translate("ProfileSettingsDialog", "Close", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class ProfileSettingsDialog: public Ui_ProfileSettingsDialog {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_PROFILESETTINGSDIALOG_H diff --git a/src/vicar-config/uis/ui_profileswindow.h b/src/vicar-config/uis/ui_profileswindow.h deleted file mode 100644 index e4cceb3..0000000 --- a/src/vicar-config/uis/ui_profileswindow.h +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'profileswindow.ui' -** -** Created: Mon Jan 2 23:41:00 2012 -** by: Qt User Interface Compiler version 4.7.4 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_PROFILESWINDOW_H -#define UI_PROFILESWINDOW_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_ProfilesWindow -{ -public: - QAction *actionRoutingEnabled; - QAction *actionRouteOnDefault; - QAction *actionEditDefaultProfile; - QWidget *centralwidget; - QWidget *layoutWidget; - QVBoxLayout *verticalLayout; - QHBoxLayout *horizontalLayout; - QPushButton *addButton; - QPushButton *editButton; - QPushButton *removeButton; - QSpacerItem *verticalSpacer; - QListWidget *profilesListWidget; - QMenuBar *menubar; - QMenu *menuVicarProfiles; - - void setupUi(QMainWindow *ProfilesWindow) - { - if (ProfilesWindow->objectName().isEmpty()) - ProfilesWindow->setObjectName(QString::fromUtf8("ProfilesWindow")); - ProfilesWindow->resize(800, 480); - actionRoutingEnabled = new QAction(ProfilesWindow); - actionRoutingEnabled->setObjectName(QString::fromUtf8("actionRoutingEnabled")); - actionRoutingEnabled->setCheckable(true); - actionRouteOnDefault = new QAction(ProfilesWindow); - actionRouteOnDefault->setObjectName(QString::fromUtf8("actionRouteOnDefault")); - actionRouteOnDefault->setCheckable(true); - actionEditDefaultProfile = new QAction(ProfilesWindow); - actionEditDefaultProfile->setObjectName(QString::fromUtf8("actionEditDefaultProfile")); - centralwidget = new QWidget(ProfilesWindow); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - layoutWidget = new QWidget(centralwidget); - layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); - layoutWidget->setGeometry(QRect(31, 11, 741, 411)); - verticalLayout = new QVBoxLayout(layoutWidget); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - verticalLayout->setContentsMargins(0, 0, 0, 0); - horizontalLayout = new QHBoxLayout(); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - addButton = new QPushButton(layoutWidget); - addButton->setObjectName(QString::fromUtf8("addButton")); - - horizontalLayout->addWidget(addButton); - - editButton = new QPushButton(layoutWidget); - editButton->setObjectName(QString::fromUtf8("editButton")); - - horizontalLayout->addWidget(editButton); - - removeButton = new QPushButton(layoutWidget); - removeButton->setObjectName(QString::fromUtf8("removeButton")); - - horizontalLayout->addWidget(removeButton); - - - verticalLayout->addLayout(horizontalLayout); - - verticalSpacer = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Fixed); - - verticalLayout->addItem(verticalSpacer); - - profilesListWidget = new QListWidget(layoutWidget); - profilesListWidget->setObjectName(QString::fromUtf8("profilesListWidget")); - profilesListWidget->setAlternatingRowColors(true); - - verticalLayout->addWidget(profilesListWidget); - - ProfilesWindow->setCentralWidget(centralwidget); - menubar = new QMenuBar(ProfilesWindow); - menubar->setObjectName(QString::fromUtf8("menubar")); - menubar->setGeometry(QRect(0, 0, 800, 27)); - menuVicarProfiles = new QMenu(menubar); - menuVicarProfiles->setObjectName(QString::fromUtf8("menuVicarProfiles")); - ProfilesWindow->setMenuBar(menubar); - - menubar->addAction(menuVicarProfiles->menuAction()); - menuVicarProfiles->addAction(actionRoutingEnabled); - menuVicarProfiles->addAction(actionRouteOnDefault); - menuVicarProfiles->addAction(actionEditDefaultProfile); - - retranslateUi(ProfilesWindow); - - QMetaObject::connectSlotsByName(ProfilesWindow); - } // setupUi - - void retranslateUi(QMainWindow *ProfilesWindow) - { - ProfilesWindow->setWindowTitle(QApplication::translate("ProfilesWindow", "VICaR - Profiles", 0, QApplication::UnicodeUTF8)); - actionRoutingEnabled->setText(QApplication::translate("ProfilesWindow", "Routing Enabled", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionRoutingEnabled->setToolTip(QApplication::translate("ProfilesWindow", "Call Routing Enabled?", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - actionRouteOnDefault->setText(QApplication::translate("ProfilesWindow", "Call Directly on Default", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionRouteOnDefault->setToolTip(QApplication::translate("ProfilesWindow", "Call directly if no match found?", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - actionEditDefaultProfile->setText(QApplication::translate("ProfilesWindow", "Edit Default Profile", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionEditDefaultProfile->setToolTip(QApplication::translate("ProfilesWindow", "Create/Edit profile to be used when no other profile is found for a number", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - addButton->setText(QApplication::translate("ProfilesWindow", "Add", 0, QApplication::UnicodeUTF8)); - editButton->setText(QApplication::translate("ProfilesWindow", "Edit", 0, QApplication::UnicodeUTF8)); - removeButton->setText(QApplication::translate("ProfilesWindow", "Remove", 0, QApplication::UnicodeUTF8)); - menuVicarProfiles->setTitle(QApplication::translate("ProfilesWindow", "VICaR - Profiles", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class ProfilesWindow: public Ui_ProfilesWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_PROFILESWINDOW_H diff --git a/src/vicar-utils/cpp/main.cpp b/src/vicar-utils/cpp/main.cpp index 9f4af57..2f5c828 100755 --- a/src/vicar-utils/cpp/main.cpp +++ b/src/vicar-utils/cpp/main.cpp @@ -45,17 +45,16 @@ int main(int argc, char *argv[]) //qDBusRegisterMetaType(); //qDBusRegisterMetaType(); - TelepathyUtility *tpUtility = new TelepathyUtility(); - DatabaseUtility *databaseUtility = new DatabaseUtility(); - HarmattanAccountUtility *accountUtility = new HarmattanAccountUtility(); + TelepathyUtility tpUtility; + DatabaseUtility databaseUtility; if (argc > 1 && argv[1]){ QString instruction = QString(argv[1]); if (instruction == "INSTALL"){ //Check if Account already exists - if (!tpUtility->accountExists()){ + if (!tpUtility.accountExists()){ qDebug() << "VICaR account not found. Creating .."; - bool result = tpUtility->createAccount(); + bool result = tpUtility.createAccount(); if (!result) exit(1); } else{ @@ -63,41 +62,41 @@ int main(int argc, char *argv[]) } } else if (instruction == "REMOVE"){ - bool result = tpUtility->deleteAccount(); + bool result = tpUtility.deleteAccount(); if (!result) exit(2); } else if (instruction == "TESTING"){ - tpUtility->callNumberWithRing(argv[2]); + tpUtility.callNumberWithRing(argv[2]); } else if (instruction == "TPACCOUNTSTATUS"){ - QString status = tpUtility->getAccountStatus(); + QString status = tpUtility.getAccountStatus(); qDebug() << "Account Status is "<< status; } #if defined(Q_WS_MAEMO_5) else if (instruction == "CREATEDB"){ - bool result = databaseUtility->openDatabase(); + bool result = databaseUtility.openDatabase(); if (!result){ qDebug() <<"Error creating vicar database. " - <lastError(); + <prepareTables(); + result = databaseUtility.prepareTables(); if (!result){ qDebug() <<"Error creating tables. " - <lastError(); + <closeDatabase(); + databaseUtility.closeDatabase(); } else if (instruction == "DROPDB"){ - bool result = databaseUtility->deleteDatabase(); + bool result = databaseUtility.deleteDatabase(); if (!result){ qDebug() <<"Error deleting vicar database. " - <lastError(); + <addAccount(); + HarmattanAccountUtility accountUtility; + accountUtility.addAccount(); } else if (instruction == "--delete-account"){ qDebug() << "Deleting account"; - accountUtility->removeAccount(); + HarmattanAccountUtility accountUtility; + accountUtility.removeAccount(); } #endif else { @@ -121,10 +122,4 @@ int main(int argc, char *argv[]) qDebug() << QCryptographicHash::hash("VICaR",QCryptographicHash::Md5).toHex(); } - delete (tpUtility); - delete (databaseUtility); - delete (accountUtility); - tpUtility = 0; - databaseUtility = 0; - accountUtility = 0; } -- 1.7.9.5