From: Sudheer K Date: Mon, 12 Dec 2011 05:53:25 +0000 (-0800) Subject: Release version 0.6-2 X-Git-Url: http://git.maemo.org/git/?p=vicar;a=commitdiff_plain;h=89f0017e6a73945ea83247472a6fa07d6ee536b5 Release version 0.6-2 --- diff --git a/debian/changelog b/debian/changelog index 2e5f963..309c24a 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,6 @@ -vicar (0.6-1) unstable; urgency=low +vicar (0.6-2) unstable; urgency=low - * Added support for blank space in phone numbers. - * Added a default profile to be used if no matching profile is found for a number. This feature can be accessed via "Edit Default Profile" button in context menu. - * Removed the pause before the DTMF tone (This was hardcoded in previous releases, to add more delay before sending DTMF tone, add "p" (pause) characters in DTMF Prefix field as necessary. - * Minor UI changes in VICaR config screen (Button resize, label changes). + * Calling card number can now have a +. - -- Sudheer K. Sun, 27 Feb 2011 16:10:00 -0800 + -- Sudheer K. Sun, 12 Dec 2011 16:10:00 -0800 diff --git a/debian/files b/debian/files index 80c4ebc..61c829e 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -vicar_0.6-1_armel.deb user/network extra +vicar_0.6-2_armel.deb user/network extra diff --git a/debian/prerm b/debian/prerm old mode 100644 new mode 100755 diff --git a/debian/vicar.substvars b/debian/vicar.substvars index cc87600..f550295 100644 --- a/debian/vicar.substvars +++ b/debian/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.6.2~git20100401), libqt4-dbus (>= 4.6.2~git20100401), libqt4-gui (>= 4.6.2~git20100401), libqt4-sql (>= 4.6.2~git20100401), libqt4-xml (>= 4.6.2~git20100401), libstdc++6 (>= 4.2.1) +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) +misc:Depends= diff --git a/src/data/event.d/launch-vicar b/src/data/event.d/launch-vicar deleted file mode 100644 index 6548ffb..0000000 --- a/src/data/event.d/launch-vicar +++ /dev/null @@ -1,17 +0,0 @@ -description "Starting VICaR daemon to route international calls" -author "Sudheer K." - -start on started hildon-desktop -stop on starting shutdown - -console none - -script - - if [ -x "/opt/vicar/vicar-daemon" ]; then - exec /opt/vicar/vicar-daemon - fi - -end script - -normal exit 1 diff --git a/src/data/xml/connectioninterfacerequestsadaptor.cpp b/src/data/xml/connectioninterfacerequestsadaptor.cpp deleted file mode 100644 index 4ddb520..0000000 --- a/src/data/xml/connectioninterfacerequestsadaptor.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -i ../../connectioninterfacerequeststypes.h -c ConnectionInterfaceRequestsAdaptor -a connectioninterfacerequestsadaptor.h:connectioninterfacerequestsadaptor.cpp org.freedesktop.Telepathy.Connection.I.Requests.xml - * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - * - * This is an auto-generated file. - * Do not edit! All changes made to it will be lost. - */ - -#include "connectioninterfacerequestsadaptor.h" -#include -#include -#include -#include -#include -#include -#include - -/* - * Implementation of adaptor class ConnectionInterfaceRequestsAdaptor - */ - -ConnectionInterfaceRequestsAdaptor::ConnectionInterfaceRequestsAdaptor(QObject *parent) - : QDBusAbstractAdaptor(parent) -{ - // constructor - setAutoRelaySignals(true); -} - -ConnectionInterfaceRequestsAdaptor::~ConnectionInterfaceRequestsAdaptor() -{ - // destructor -} - -org::freedesktop::Telepathy::RequestableChannelClassList ConnectionInterfaceRequestsAdaptor::requestableChannelClasses() const -{ - // get the value of property RequestableChannelClasses - return qvariant_cast< org::freedesktop::Telepathy::RequestableChannelClassList >(parent()->property("RequestableChannelClasses")); -} - -QDBusObjectPath ConnectionInterfaceRequestsAdaptor::CreateChannel(const QVariantMap &request, QVariantMap &channel_properties) -{ - // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.CreateChannel - //return static_cast(parent())->CreateChannel(request, channel_properties); -} - -bool ConnectionInterfaceRequestsAdaptor::EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties) -{ - // handle method call org.freedesktop.Telepathy.Connection.Interface.Requests.EnsureChannel - //return static_cast(parent())->EnsureChannel(request, channel_object, channel_properties); -} - diff --git a/src/data/xml/connectioninterfacerequestsadaptor.h b/src/data/xml/connectioninterfacerequestsadaptor.h deleted file mode 100644 index fb99320..0000000 --- a/src/data/xml/connectioninterfacerequestsadaptor.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.7 - * Command line was: qdbusxml2cpp -i ../../connectioninterfacerequeststypes.h -c ConnectionInterfaceRequestsAdaptor -a connectioninterfacerequestsadaptor.h:connectioninterfacerequestsadaptor.cpp org.freedesktop.Telepathy.Connection.I.Requests.xml - * - * qdbusxml2cpp is Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). - * - * This is an auto-generated file. - * This file may have been hand-edited. Look for HAND-EDIT comments - * before re-generating it. - */ - -#ifndef CONNECTIONINTERFACEREQUESTSADAPTOR_H_1282550631 -#define CONNECTIONINTERFACEREQUESTSADAPTOR_H_1282550631 - -#include -#include -#include "../../connectioninterfacerequeststypes.h" -class QByteArray; -template class QList; -template class QMap; -class QString; -class QStringList; -class QVariant; - -/* - * Adaptor class for interface org.freedesktop.Telepathy.Connection.Interface.Requests - */ -class ConnectionInterfaceRequestsAdaptor: public QDBusAbstractAdaptor -{ - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.Connection.Interface.Requests") - Q_CLASSINFO("D-Bus Introspection", "" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" - "") -public: - ConnectionInterfaceRequestsAdaptor(QObject *parent); - virtual ~ConnectionInterfaceRequestsAdaptor(); - -public: // PROPERTIES - Q_PROPERTY(org::freedesktop::Telepathy::RequestableChannelClassList RequestableChannelClasses READ requestableChannelClasses) - org::freedesktop::Telepathy::RequestableChannelClassList requestableChannelClasses() const; - -public Q_SLOTS: // METHODS - QDBusObjectPath CreateChannel(const QVariantMap &request, QVariantMap &channel_properties); - bool EnsureChannel(const QVariantMap &request, QDBusObjectPath &channel_object, QVariantMap &channel_properties); -Q_SIGNALS: // SIGNALS - void ChannelClosed(const QDBusObjectPath &removed_channel_object); - void NewChannels(org::freedesktop::Telepathy::ChannelDetailsList new_channels); -}; - -#endif diff --git a/src/vicar-config/src/configwindow.cpp b/src/vicar-config/src/configwindow.cpp deleted file mode 100644 index 6b5a05a..0000000 --- a/src/vicar-config/src/configwindow.cpp +++ /dev/null @@ -1,172 +0,0 @@ -/* -@version: 0.2 -@author: Sudheer K. -@license: GNU General Public License -*/ - -#include "configwindow.h" -#include "ui_configwindow.h" -#include "gconfutility.h" -#include "dbusutility.h" -#include -#include - -ConfigWindow::ConfigWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::ConfigWindow) -{ - ui->setupUi(this); - gconfUtility = new GConfUtility(); - loadValues(); -} - -ConfigWindow::~ConfigWindow() -{ - delete ui; - delete gconfUtility; - gconfUtility = 0; -} - -void ConfigWindow::changeEvent(QEvent *e) -{ - QMainWindow::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } -} - -void ConfigWindow::closeEvent(QCloseEvent *e) -{ - if (verifyConfigData()){ - qDebug() << "Verification successful. Saving data to gconf"; - saveConfigData(); - e->accept(); - } - else{ - e->ignore(); - } -} - -void ConfigWindow::on_actionSave_triggered() -{ - if (verifyConfigData()){ - qDebug() << "Verification successful. Saving data to gconf"; - saveConfigData(); - } - -} - -void ConfigWindow::on_actionReset_triggered() -{ - ui->checkBoxIntlCallRedirEnabled->setChecked(false); - ui->lineEditCallingCardNumber->clear(); - ui->lineEditCountryCodesToExclude->clear(); - ui->comboBoxDTMFFormat->clear(); - ui->comboBoxDTMFSuffix->clear(); - ui->spinBoxDTMFDelay->setValue(1); -} - -void ConfigWindow::loadValues(){ - - bool isRoutingEnabled = gconfUtility->getGconfValueBoolean("routing_enabled"); - QString strCallingCardNumber = gconfUtility->getGconfValueString("calling_card_number"); - QString strNumbersToExclude = gconfUtility->getGconfValueString("numbers_to_exclude"); - QString strDTMFFormat = gconfUtility->getGconfValueString("dtmf_format"); - QString strDTMFSuffix = gconfUtility->getGconfValueString("dtmf_suffix"); - int intDTMFDelay = gconfUtility->getGconfValueInteger("dtmf_delay"); - - ui->checkBoxIntlCallRedirEnabled->setChecked(isRoutingEnabled); - ui->lineEditCallingCardNumber->setText(strCallingCardNumber); - ui->lineEditCountryCodesToExclude->setText(strNumbersToExclude); - int intIndex = ui->comboBoxDTMFFormat->findText(strDTMFFormat); - ui->comboBoxDTMFFormat->setCurrentIndex(intIndex); - intIndex = ui->comboBoxDTMFSuffix->findText(strDTMFSuffix); - ui->comboBoxDTMFSuffix->setCurrentIndex(intIndex); - ui->spinBoxDTMFDelay->setValue(intDTMFDelay); - - //Accept numbers only for Calling Card Number field - ui->lineEditCallingCardNumber->setValidator(new QRegExpValidator( QRegExp( "^-?\\d\\d*$"), this)); - - qDebug() << "Values loaded from GConf"; - -} - -bool ConfigWindow::verifyConfigData(){ - //Verify whether user-input matches application requirements - bool isRoutingEnabled = ui->checkBoxIntlCallRedirEnabled->isChecked(); - QString strCallingCardNumber = ui->lineEditCallingCardNumber->text(); - QString strNumbersToExclude = ui->lineEditCountryCodesToExclude->text(); - - - QString strMessage = QString(""); - - if (isRoutingEnabled){ - //Call Routing is checked. Now validate other values - if (strCallingCardNumber.isEmpty()){ - strMessage.append("Enter a calling card number\n"); - ui->lineEditCallingCardNumber->setFocus(); - } - - if (strCallingCardNumber.startsWith("+")||strCallingCardNumber.startsWith("00")){ - strMessage.append("Calling card number must be a local number. \nPlease remove the international dialing code.\n"); - ui->lineEditCallingCardNumber->setFocus(); - } - - } - - if (!strMessage.isEmpty()){ - QMessageBox::warning(this,"Invalid Data",strMessage); - return false; - } - else{ - return true; - } -} - -void ConfigWindow::saveConfigData(){ - - bool isRoutingEnabled = ui->checkBoxIntlCallRedirEnabled->isChecked(); - QString strCallingCardNumber = ui->lineEditCallingCardNumber->text(); - QString strNumbersToExclude = ui->lineEditCountryCodesToExclude->text(); - - QString strDTMFFormat = ui->comboBoxDTMFFormat->currentText(); - QString strDTMFSuffix = ui->comboBoxDTMFSuffix->currentText(); - int intDTMFDelay = ui->spinBoxDTMFDelay->value(); - - - gconfUtility->setGconfValueBoolean("routing_enabled",isRoutingEnabled); - - if (!strCallingCardNumber.isEmpty()){ - gconfUtility->setGconfValueString("calling_card_number",strCallingCardNumber); - } - - if (!strNumbersToExclude.isEmpty()){ - strNumbersToExclude = strNumbersToExclude.remove(" "); - strNumbersToExclude = strNumbersToExclude.remove("\t"); - strNumbersToExclude = strNumbersToExclude.replace("\n",","); - } - - gconfUtility->setGconfValueString("numbers_to_exclude",strNumbersToExclude); - gconfUtility->setGconfValueInteger("dtmf_delay",intDTMFDelay); - gconfUtility->setGconfValueString("dtmf_format",strDTMFFormat); - gconfUtility->setGconfValueString("dtmf_suffix",strDTMFSuffix); - - DbusUtility dbusUtility = DbusUtility(); - - qDebug() << "Settings updated"; - dbusUtility.displayNotification("VICaR: Settings Updated."); - - if (isRoutingEnabled){ - qDebug() << "Enable call routing immediately"; - dbusUtility.sendSignal(APPLICATION_DBUS_PATH,APPLICATION_DBUS_INTERFACE,"startOutgoingCallMonitor"); - } - else{ - qDebug() << "Disable call routing immediately"; - dbusUtility.sendSignal(APPLICATION_DBUS_PATH,APPLICATION_DBUS_INTERFACE,"stopOutgoingCallMonitor"); - } -} - diff --git a/src/vicar-config/src/configwindow.h b/src/vicar-config/src/configwindow.h deleted file mode 100644 index 175223a..0000000 --- a/src/vicar-config/src/configwindow.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -@version: 0.2 -@author: Sudheer K. -@license: GNU General Public License -*/ - -#ifndef CONFIGWINDOW_H -#define CONFIGWINDOW_H - -#include -#include -#include "gconfutility.h" - -#define APPLICATION_DBUS_PATH "/org/maemo/vicar" -#define APPLICATION_DBUS_INTERFACE "org.maemo.vicar" - -namespace Ui { - class ConfigWindow; -} - -class ConfigWindow : public QMainWindow { - Q_OBJECT -public: - ConfigWindow(QWidget *parent = 0); - ~ConfigWindow(); - void loadValues(); - bool verifyConfigData(); - void saveConfigData(); - -protected: - void changeEvent(QEvent *e); - void closeEvent(QCloseEvent *e); - -private: - Ui::ConfigWindow *ui; - GConfUtility *gconfUtility; - -private slots: - void on_actionReset_triggered(); - void on_actionSave_triggered(); -}; - -#endif // CONFIGWINDOW_H diff --git a/src/vicar-config/src/profilesettingsdialog.cpp b/src/vicar-config/src/profilesettingsdialog.cpp index 51cfb1e..a0c827d 100644 --- a/src/vicar-config/src/profilesettingsdialog.cpp +++ b/src/vicar-config/src/profilesettingsdialog.cpp @@ -33,7 +33,8 @@ ProfileSettingsDialog::ProfileSettingsDialog(QWidget *parent, org::maemo::vicar: ui->lineEditDTMFSuffix->setText(profile->dtmfSuffix); } - ui->lineEditCallingCardNumber->setValidator(new QRegExpValidator(QRegExp( "^-?\\d\\d*$"), this)); + //ui->lineEditCallingCardNumber->setValidator(new QRegExpValidator(QRegExp( "^-?\\d\\d*$"), this)); + ui->lineEditCallingCardNumber->setValidator(new QRegExpValidator(QRegExp( "^[0-9\\+]*$"), this)); ui->lineEditDTMFPrefix->setValidator(new QRegExpValidator(QRegExp( "^[0-9p#\\*]*$"), this)); ui->lineEditDTMFSuffix->setValidator(new QRegExpValidator(QRegExp( "^[0-9p#\\*]*$"), this)); } diff --git a/src/vicar-config/uis/configwindow.ui b/src/vicar-config/uis/configwindow.ui deleted file mode 100644 index 91abd8a..0000000 --- a/src/vicar-config/uis/configwindow.ui +++ /dev/null @@ -1,403 +0,0 @@ - - - ConfigWindow - - - - 0 - 0 - 800 - 480 - - - - VICaR - Settings - - - - - - 0 - 9 - 800 - 478 - - - - true - - - - - 0 - 0 - 798 - 476 - - - - - - 0 - 0 - 789 - 231 - - - - Basic - - - - - 10 - 20 - 751 - 201 - - - - - QFormLayout::AllNonFixedFieldsGrow - - - 10 - - - - - - 0 - 0 - - - - - 300 - 25 - - - - - 300 - 16777215 - - - - International Call Routing: - - - 0 - - - - - - - - 0 - 0 - - - - - 175 - 60 - - - - Enabled - - - - - - - Calling Card Number: - - - - - - - - 0 - 0 - - - - - 0 - 60 - - - - Qt::ImhDigitsOnly - - - - - - - Country Codes to Exclude: - - - - - - - - 0 - 0 - - - - - 0 - 60 - - - - Qt::ImhDigitsOnly - - - - - - - - - - 0 - 240 - 789 - 271 - - - - Advanced - - - - - 10 - 30 - 771 - 171 - - - - - QLayout::SetDefaultConstraint - - - QFormLayout::AllNonFixedFieldsGrow - - - 10 - - - 9 - - - - - - 0 - 0 - - - - - 300 - 25 - - - - - 300 - 16777215 - - - - Format required for DTMF tone: - - - true - - - - - - - - 0 - 0 - - - - - 50 - 60 - - - - - <Country Code><Area Code><Phone Number> - - - - - +<Country Code><Area Code><Phone Number> - - - - - 00<Country Code><Area Code><Phone Number> - - - - - 011<Country Code><Area Code><Phone Number> - - - - - - - - - 0 - 0 - - - - - 100 - 60 - - - - Qt::LeftToRight - - - 1 - - - 10 - - - - - - - - 0 - 0 - - - - - 300 - 25 - - - - - 300 - 16777215 - - - - Delay before sending DTMF (no of pauses): - - - true - - - - - - - Suffix after DTMF tone - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - --None-- - - - - - # - - - - - * - - - - - - - - - - - - - - 0 - 0 - 800 - 23 - - - - - VICaR - Configuration - - - - - - - - - Save - - - Save Settings - - - - - - - - Reset - - - Reset Settings - - - - - - diff --git a/src/vicar-config/uis/ui_configwindow.h b/src/vicar-config/uis/ui_configwindow.h deleted file mode 100644 index 63c107f..0000000 --- a/src/vicar-config/uis/ui_configwindow.h +++ /dev/null @@ -1,278 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'configwindow.ui' -** -** Created: Sun Jun 6 09:52:22 2010 -** by: Qt User Interface Compiler version 4.6.2 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_CONFIGWINDOW_H -#define UI_CONFIGWINDOW_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_ConfigWindow -{ -public: - QAction *actionSave; - QAction *actionReset; - QWidget *centralwidget; - QScrollArea *scrollArea; - QWidget *scrollAreaWidgetContents; - QGroupBox *groupBoxBasic; - QWidget *formLayoutWidget; - QFormLayout *formLayoutBasic; - QLabel *labelCallRedirection; - QCheckBox *checkBoxIntlCallRedirEnabled; - QLabel *labelCallingCardNumber; - QLineEdit *lineEditCallingCardNumber; - QLabel *labelCountryCodesToExclude; - QLineEdit *lineEditCountryCodesToExclude; - QGroupBox *groupBoxAdvanced; - QWidget *formLayoutWidget_2; - QFormLayout *formLayoutAdvanced; - QLabel *labelDTMFFormat; - QComboBox *comboBoxDTMFFormat; - QSpinBox *spinBoxDTMFDelay; - QLabel *labelDTMFDelay; - QLabel *labelDTMFSuffix; - QComboBox *comboBoxDTMFSuffix; - QMenuBar *menubar; - QMenu *menuVicarConfiguration; - - void setupUi(QMainWindow *ConfigWindow) - { - if (ConfigWindow->objectName().isEmpty()) - ConfigWindow->setObjectName(QString::fromUtf8("ConfigWindow")); - ConfigWindow->resize(800, 480); - actionSave = new QAction(ConfigWindow); - actionSave->setObjectName(QString::fromUtf8("actionSave")); - QFont font; - actionSave->setFont(font); - actionReset = new QAction(ConfigWindow); - actionReset->setObjectName(QString::fromUtf8("actionReset")); - centralwidget = new QWidget(ConfigWindow); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - scrollArea = new QScrollArea(centralwidget); - scrollArea->setObjectName(QString::fromUtf8("scrollArea")); - scrollArea->setGeometry(QRect(0, 9, 800, 478)); - scrollArea->setWidgetResizable(true); - scrollAreaWidgetContents = new QWidget(); - scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 798, 476)); - groupBoxBasic = new QGroupBox(scrollAreaWidgetContents); - groupBoxBasic->setObjectName(QString::fromUtf8("groupBoxBasic")); - groupBoxBasic->setGeometry(QRect(0, 0, 789, 231)); - formLayoutWidget = new QWidget(groupBoxBasic); - formLayoutWidget->setObjectName(QString::fromUtf8("formLayoutWidget")); - formLayoutWidget->setGeometry(QRect(10, 20, 751, 201)); - formLayoutBasic = new QFormLayout(formLayoutWidget); - formLayoutBasic->setObjectName(QString::fromUtf8("formLayoutBasic")); - formLayoutBasic->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayoutBasic->setContentsMargins(10, 0, 0, 0); - labelCallRedirection = new QLabel(formLayoutWidget); - labelCallRedirection->setObjectName(QString::fromUtf8("labelCallRedirection")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(labelCallRedirection->sizePolicy().hasHeightForWidth()); - labelCallRedirection->setSizePolicy(sizePolicy); - labelCallRedirection->setMinimumSize(QSize(300, 25)); - labelCallRedirection->setMaximumSize(QSize(300, 16777215)); - labelCallRedirection->setMargin(0); - - formLayoutBasic->setWidget(0, QFormLayout::LabelRole, labelCallRedirection); - - checkBoxIntlCallRedirEnabled = new QCheckBox(formLayoutWidget); - checkBoxIntlCallRedirEnabled->setObjectName(QString::fromUtf8("checkBoxIntlCallRedirEnabled")); - QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(checkBoxIntlCallRedirEnabled->sizePolicy().hasHeightForWidth()); - checkBoxIntlCallRedirEnabled->setSizePolicy(sizePolicy1); - checkBoxIntlCallRedirEnabled->setMinimumSize(QSize(175, 60)); - - formLayoutBasic->setWidget(0, QFormLayout::FieldRole, checkBoxIntlCallRedirEnabled); - - labelCallingCardNumber = new QLabel(formLayoutWidget); - labelCallingCardNumber->setObjectName(QString::fromUtf8("labelCallingCardNumber")); - - formLayoutBasic->setWidget(1, QFormLayout::LabelRole, labelCallingCardNumber); - - lineEditCallingCardNumber = new QLineEdit(formLayoutWidget); - lineEditCallingCardNumber->setObjectName(QString::fromUtf8("lineEditCallingCardNumber")); - QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); - sizePolicy2.setHeightForWidth(lineEditCallingCardNumber->sizePolicy().hasHeightForWidth()); - lineEditCallingCardNumber->setSizePolicy(sizePolicy2); - lineEditCallingCardNumber->setMinimumSize(QSize(0, 60)); - lineEditCallingCardNumber->setInputMethodHints(Qt::ImhDigitsOnly); - - formLayoutBasic->setWidget(1, QFormLayout::FieldRole, lineEditCallingCardNumber); - - labelCountryCodesToExclude = new QLabel(formLayoutWidget); - labelCountryCodesToExclude->setObjectName(QString::fromUtf8("labelCountryCodesToExclude")); - - formLayoutBasic->setWidget(2, QFormLayout::LabelRole, labelCountryCodesToExclude); - - lineEditCountryCodesToExclude = new QLineEdit(formLayoutWidget); - lineEditCountryCodesToExclude->setObjectName(QString::fromUtf8("lineEditCountryCodesToExclude")); - sizePolicy2.setHeightForWidth(lineEditCountryCodesToExclude->sizePolicy().hasHeightForWidth()); - lineEditCountryCodesToExclude->setSizePolicy(sizePolicy2); - lineEditCountryCodesToExclude->setMinimumSize(QSize(0, 60)); - lineEditCountryCodesToExclude->setInputMethodHints(Qt::ImhDigitsOnly); - - formLayoutBasic->setWidget(2, QFormLayout::FieldRole, lineEditCountryCodesToExclude); - - groupBoxAdvanced = new QGroupBox(scrollAreaWidgetContents); - groupBoxAdvanced->setObjectName(QString::fromUtf8("groupBoxAdvanced")); - groupBoxAdvanced->setGeometry(QRect(0, 240, 789, 271)); - formLayoutWidget_2 = new QWidget(groupBoxAdvanced); - formLayoutWidget_2->setObjectName(QString::fromUtf8("formLayoutWidget_2")); - formLayoutWidget_2->setGeometry(QRect(10, 30, 771, 171)); - formLayoutAdvanced = new QFormLayout(formLayoutWidget_2); - formLayoutAdvanced->setObjectName(QString::fromUtf8("formLayoutAdvanced")); - formLayoutAdvanced->setSizeConstraint(QLayout::SetDefaultConstraint); - formLayoutAdvanced->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayoutAdvanced->setContentsMargins(10, 0, 0, 9); - labelDTMFFormat = new QLabel(formLayoutWidget_2); - labelDTMFFormat->setObjectName(QString::fromUtf8("labelDTMFFormat")); - sizePolicy.setHeightForWidth(labelDTMFFormat->sizePolicy().hasHeightForWidth()); - labelDTMFFormat->setSizePolicy(sizePolicy); - labelDTMFFormat->setMinimumSize(QSize(300, 25)); - labelDTMFFormat->setMaximumSize(QSize(300, 16777215)); - labelDTMFFormat->setWordWrap(true); - - formLayoutAdvanced->setWidget(0, QFormLayout::LabelRole, labelDTMFFormat); - - comboBoxDTMFFormat = new QComboBox(formLayoutWidget_2); - comboBoxDTMFFormat->setObjectName(QString::fromUtf8("comboBoxDTMFFormat")); - QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Minimum); - sizePolicy3.setHorizontalStretch(0); - sizePolicy3.setVerticalStretch(0); - sizePolicy3.setHeightForWidth(comboBoxDTMFFormat->sizePolicy().hasHeightForWidth()); - comboBoxDTMFFormat->setSizePolicy(sizePolicy3); - comboBoxDTMFFormat->setMinimumSize(QSize(50, 60)); - - formLayoutAdvanced->setWidget(0, QFormLayout::FieldRole, comboBoxDTMFFormat); - - spinBoxDTMFDelay = new QSpinBox(formLayoutWidget_2); - spinBoxDTMFDelay->setObjectName(QString::fromUtf8("spinBoxDTMFDelay")); - QSizePolicy sizePolicy4(QSizePolicy::Fixed, QSizePolicy::Minimum); - sizePolicy4.setHorizontalStretch(0); - sizePolicy4.setVerticalStretch(0); - sizePolicy4.setHeightForWidth(spinBoxDTMFDelay->sizePolicy().hasHeightForWidth()); - spinBoxDTMFDelay->setSizePolicy(sizePolicy4); - spinBoxDTMFDelay->setMinimumSize(QSize(100, 60)); - spinBoxDTMFDelay->setLayoutDirection(Qt::LeftToRight); - spinBoxDTMFDelay->setMinimum(1); - spinBoxDTMFDelay->setMaximum(10); - - formLayoutAdvanced->setWidget(2, QFormLayout::FieldRole, spinBoxDTMFDelay); - - labelDTMFDelay = new QLabel(formLayoutWidget_2); - labelDTMFDelay->setObjectName(QString::fromUtf8("labelDTMFDelay")); - sizePolicy.setHeightForWidth(labelDTMFDelay->sizePolicy().hasHeightForWidth()); - labelDTMFDelay->setSizePolicy(sizePolicy); - labelDTMFDelay->setMinimumSize(QSize(300, 25)); - labelDTMFDelay->setMaximumSize(QSize(300, 16777215)); - labelDTMFDelay->setWordWrap(true); - - formLayoutAdvanced->setWidget(2, QFormLayout::LabelRole, labelDTMFDelay); - - labelDTMFSuffix = new QLabel(formLayoutWidget_2); - labelDTMFSuffix->setObjectName(QString::fromUtf8("labelDTMFSuffix")); - - formLayoutAdvanced->setWidget(1, QFormLayout::LabelRole, labelDTMFSuffix); - - comboBoxDTMFSuffix = new QComboBox(formLayoutWidget_2); - comboBoxDTMFSuffix->setObjectName(QString::fromUtf8("comboBoxDTMFSuffix")); - sizePolicy1.setHeightForWidth(comboBoxDTMFSuffix->sizePolicy().hasHeightForWidth()); - comboBoxDTMFSuffix->setSizePolicy(sizePolicy1); - comboBoxDTMFSuffix->setMinimumSize(QSize(50, 0)); - - formLayoutAdvanced->setWidget(1, QFormLayout::FieldRole, comboBoxDTMFSuffix); - - scrollArea->setWidget(scrollAreaWidgetContents); - ConfigWindow->setCentralWidget(centralwidget); - menubar = new QMenuBar(ConfigWindow); - menubar->setObjectName(QString::fromUtf8("menubar")); - menubar->setGeometry(QRect(0, 0, 800, 23)); - menuVicarConfiguration = new QMenu(menubar); - menuVicarConfiguration->setObjectName(QString::fromUtf8("menuVicarConfiguration")); - ConfigWindow->setMenuBar(menubar); - - menubar->addAction(menuVicarConfiguration->menuAction()); - menuVicarConfiguration->addAction(actionSave); - menuVicarConfiguration->addAction(actionReset); - - retranslateUi(ConfigWindow); - - QMetaObject::connectSlotsByName(ConfigWindow); - } // setupUi - - void retranslateUi(QMainWindow *ConfigWindow) - { - ConfigWindow->setWindowTitle(QApplication::translate("ConfigWindow", "VICaR - Settings", 0, QApplication::UnicodeUTF8)); - actionSave->setText(QApplication::translate("ConfigWindow", "Save", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionSave->setToolTip(QApplication::translate("ConfigWindow", "Save Settings", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - actionReset->setText(QApplication::translate("ConfigWindow", "Reset", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionReset->setToolTip(QApplication::translate("ConfigWindow", "Reset Settings", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - groupBoxBasic->setTitle(QApplication::translate("ConfigWindow", "Basic", 0, QApplication::UnicodeUTF8)); - labelCallRedirection->setText(QApplication::translate("ConfigWindow", "International Call Routing:", 0, QApplication::UnicodeUTF8)); - checkBoxIntlCallRedirEnabled->setText(QApplication::translate("ConfigWindow", "Enabled", 0, QApplication::UnicodeUTF8)); - labelCallingCardNumber->setText(QApplication::translate("ConfigWindow", "Calling Card Number:", 0, QApplication::UnicodeUTF8)); - labelCountryCodesToExclude->setText(QApplication::translate("ConfigWindow", "Country Codes to Exclude:", 0, QApplication::UnicodeUTF8)); - groupBoxAdvanced->setTitle(QApplication::translate("ConfigWindow", "Advanced", 0, QApplication::UnicodeUTF8)); - labelDTMFFormat->setText(QApplication::translate("ConfigWindow", "Format required for DTMF tone:", 0, QApplication::UnicodeUTF8)); - comboBoxDTMFFormat->clear(); - comboBoxDTMFFormat->insertItems(0, QStringList() - << QApplication::translate("ConfigWindow", "", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "+", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "00", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "011", 0, QApplication::UnicodeUTF8) - ); - labelDTMFDelay->setText(QApplication::translate("ConfigWindow", "Delay before sending DTMF (no of pauses):", 0, QApplication::UnicodeUTF8)); - labelDTMFSuffix->setText(QApplication::translate("ConfigWindow", "Suffix after DTMF tone", 0, QApplication::UnicodeUTF8)); - comboBoxDTMFSuffix->clear(); - comboBoxDTMFSuffix->insertItems(0, QStringList() - << QApplication::translate("ConfigWindow", "--None--", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "#", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "*", 0, QApplication::UnicodeUTF8) - ); - menuVicarConfiguration->setTitle(QApplication::translate("ConfigWindow", "VICaR - Configuration", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class ConfigWindow: public Ui_ConfigWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_CONFIGWINDOW_H diff --git a/src/vicar-config/uis/ui_configwindow.h~ b/src/vicar-config/uis/ui_configwindow.h~ deleted file mode 100644 index 7b72506..0000000 --- a/src/vicar-config/uis/ui_configwindow.h~ +++ /dev/null @@ -1,278 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'configwindow.ui' -** -** Created: Sun Jun 6 09:41:25 2010 -** by: Qt User Interface Compiler version 4.6.2 -** -** WARNING! All changes made in this file will be lost when recompiling UI file! -********************************************************************************/ - -#ifndef UI_CONFIGWINDOW_H -#define UI_CONFIGWINDOW_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_ConfigWindow -{ -public: - QAction *actionSave; - QAction *actionReset; - QWidget *centralwidget; - QScrollArea *scrollArea; - QWidget *scrollAreaWidgetContents; - QGroupBox *groupBoxBasic; - QWidget *formLayoutWidget; - QFormLayout *formLayoutBasic; - QLabel *labelCallRedirection; - QCheckBox *checkBoxIntlCallRedirEnabled; - QLabel *labelCallingCardNumber; - QLineEdit *lineEditCallingCardNumber; - QLabel *labelCountryCodesToExclude; - QLineEdit *lineEditCountryCodesToExclude; - QGroupBox *groupBoxAdvanced; - QWidget *formLayoutWidget_2; - QFormLayout *formLayoutAdvanced; - QLabel *labelDTMFFormat; - QComboBox *comboBoxDTMFFormat; - QSpinBox *spinBoxDTMFDelay; - QLabel *labelDTMFDelay; - QLabel *labelDTMFSuffix; - QComboBox *comboBoxDTMFSuffix; - QMenuBar *menubar; - QMenu *menuVicarConfiguration; - - void setupUi(QMainWindow *ConfigWindow) - { - if (ConfigWindow->objectName().isEmpty()) - ConfigWindow->setObjectName(QString::fromUtf8("ConfigWindow")); - ConfigWindow->resize(800, 480); - actionSave = new QAction(ConfigWindow); - actionSave->setObjectName(QString::fromUtf8("actionSave")); - QFont font; - actionSave->setFont(font); - actionReset = new QAction(ConfigWindow); - actionReset->setObjectName(QString::fromUtf8("actionReset")); - centralwidget = new QWidget(ConfigWindow); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - scrollArea = new QScrollArea(centralwidget); - scrollArea->setObjectName(QString::fromUtf8("scrollArea")); - scrollArea->setGeometry(QRect(0, 20, 800, 470)); - scrollArea->setWidgetResizable(true); - scrollAreaWidgetContents = new QWidget(); - scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 798, 600)); - groupBoxBasic = new QGroupBox(scrollAreaWidgetContents); - groupBoxBasic->setObjectName(QString::fromUtf8("groupBoxBasic")); - groupBoxBasic->setGeometry(QRect(0, 0, 789, 231)); - formLayoutWidget = new QWidget(groupBoxBasic); - formLayoutWidget->setObjectName(QString::fromUtf8("formLayoutWidget")); - formLayoutWidget->setGeometry(QRect(10, 20, 751, 201)); - formLayoutBasic = new QFormLayout(formLayoutWidget); - formLayoutBasic->setObjectName(QString::fromUtf8("formLayoutBasic")); - formLayoutBasic->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayoutBasic->setContentsMargins(10, 0, 0, 0); - labelCallRedirection = new QLabel(formLayoutWidget); - labelCallRedirection->setObjectName(QString::fromUtf8("labelCallRedirection")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(labelCallRedirection->sizePolicy().hasHeightForWidth()); - labelCallRedirection->setSizePolicy(sizePolicy); - labelCallRedirection->setMinimumSize(QSize(300, 25)); - labelCallRedirection->setMaximumSize(QSize(300, 16777215)); - labelCallRedirection->setMargin(0); - - formLayoutBasic->setWidget(0, QFormLayout::LabelRole, labelCallRedirection); - - checkBoxIntlCallRedirEnabled = new QCheckBox(formLayoutWidget); - checkBoxIntlCallRedirEnabled->setObjectName(QString::fromUtf8("checkBoxIntlCallRedirEnabled")); - QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed); - sizePolicy1.setHorizontalStretch(0); - sizePolicy1.setVerticalStretch(0); - sizePolicy1.setHeightForWidth(checkBoxIntlCallRedirEnabled->sizePolicy().hasHeightForWidth()); - checkBoxIntlCallRedirEnabled->setSizePolicy(sizePolicy1); - checkBoxIntlCallRedirEnabled->setMinimumSize(QSize(175, 60)); - - formLayoutBasic->setWidget(0, QFormLayout::FieldRole, checkBoxIntlCallRedirEnabled); - - labelCallingCardNumber = new QLabel(formLayoutWidget); - labelCallingCardNumber->setObjectName(QString::fromUtf8("labelCallingCardNumber")); - - formLayoutBasic->setWidget(1, QFormLayout::LabelRole, labelCallingCardNumber); - - lineEditCallingCardNumber = new QLineEdit(formLayoutWidget); - lineEditCallingCardNumber->setObjectName(QString::fromUtf8("lineEditCallingCardNumber")); - QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed); - sizePolicy2.setHorizontalStretch(0); - sizePolicy2.setVerticalStretch(0); - sizePolicy2.setHeightForWidth(lineEditCallingCardNumber->sizePolicy().hasHeightForWidth()); - lineEditCallingCardNumber->setSizePolicy(sizePolicy2); - lineEditCallingCardNumber->setMinimumSize(QSize(0, 60)); - lineEditCallingCardNumber->setInputMethodHints(Qt::ImhDigitsOnly); - - formLayoutBasic->setWidget(1, QFormLayout::FieldRole, lineEditCallingCardNumber); - - labelCountryCodesToExclude = new QLabel(formLayoutWidget); - labelCountryCodesToExclude->setObjectName(QString::fromUtf8("labelCountryCodesToExclude")); - - formLayoutBasic->setWidget(2, QFormLayout::LabelRole, labelCountryCodesToExclude); - - lineEditCountryCodesToExclude = new QLineEdit(formLayoutWidget); - lineEditCountryCodesToExclude->setObjectName(QString::fromUtf8("lineEditCountryCodesToExclude")); - sizePolicy2.setHeightForWidth(lineEditCountryCodesToExclude->sizePolicy().hasHeightForWidth()); - lineEditCountryCodesToExclude->setSizePolicy(sizePolicy2); - lineEditCountryCodesToExclude->setMinimumSize(QSize(0, 60)); - lineEditCountryCodesToExclude->setInputMethodHints(Qt::ImhDigitsOnly); - - formLayoutBasic->setWidget(2, QFormLayout::FieldRole, lineEditCountryCodesToExclude); - - groupBoxAdvanced = new QGroupBox(scrollAreaWidgetContents); - groupBoxAdvanced->setObjectName(QString::fromUtf8("groupBoxAdvanced")); - groupBoxAdvanced->setGeometry(QRect(0, 240, 789, 400)); - formLayoutWidget_2 = new QWidget(groupBoxAdvanced); - formLayoutWidget_2->setObjectName(QString::fromUtf8("formLayoutWidget_2")); - formLayoutWidget_2->setGeometry(QRect(10, 30, 771, 171)); - formLayoutAdvanced = new QFormLayout(formLayoutWidget_2); - formLayoutAdvanced->setObjectName(QString::fromUtf8("formLayoutAdvanced")); - formLayoutAdvanced->setSizeConstraint(QLayout::SetDefaultConstraint); - formLayoutAdvanced->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); - formLayoutAdvanced->setContentsMargins(10, 0, 0, 9); - labelDTMFFormat = new QLabel(formLayoutWidget_2); - labelDTMFFormat->setObjectName(QString::fromUtf8("labelDTMFFormat")); - sizePolicy.setHeightForWidth(labelDTMFFormat->sizePolicy().hasHeightForWidth()); - labelDTMFFormat->setSizePolicy(sizePolicy); - labelDTMFFormat->setMinimumSize(QSize(300, 25)); - labelDTMFFormat->setMaximumSize(QSize(300, 16777215)); - labelDTMFFormat->setWordWrap(true); - - formLayoutAdvanced->setWidget(0, QFormLayout::LabelRole, labelDTMFFormat); - - comboBoxDTMFFormat = new QComboBox(formLayoutWidget_2); - comboBoxDTMFFormat->setObjectName(QString::fromUtf8("comboBoxDTMFFormat")); - QSizePolicy sizePolicy3(QSizePolicy::Minimum, QSizePolicy::Minimum); - sizePolicy3.setHorizontalStretch(0); - sizePolicy3.setVerticalStretch(0); - sizePolicy3.setHeightForWidth(comboBoxDTMFFormat->sizePolicy().hasHeightForWidth()); - comboBoxDTMFFormat->setSizePolicy(sizePolicy3); - comboBoxDTMFFormat->setMinimumSize(QSize(50, 60)); - - formLayoutAdvanced->setWidget(0, QFormLayout::FieldRole, comboBoxDTMFFormat); - - spinBoxDTMFDelay = new QSpinBox(formLayoutWidget_2); - spinBoxDTMFDelay->setObjectName(QString::fromUtf8("spinBoxDTMFDelay")); - QSizePolicy sizePolicy4(QSizePolicy::Fixed, QSizePolicy::Minimum); - sizePolicy4.setHorizontalStretch(0); - sizePolicy4.setVerticalStretch(0); - sizePolicy4.setHeightForWidth(spinBoxDTMFDelay->sizePolicy().hasHeightForWidth()); - spinBoxDTMFDelay->setSizePolicy(sizePolicy4); - spinBoxDTMFDelay->setMinimumSize(QSize(100, 60)); - spinBoxDTMFDelay->setLayoutDirection(Qt::LeftToRight); - spinBoxDTMFDelay->setMinimum(1); - spinBoxDTMFDelay->setMaximum(10); - - formLayoutAdvanced->setWidget(2, QFormLayout::FieldRole, spinBoxDTMFDelay); - - labelDTMFDelay = new QLabel(formLayoutWidget_2); - labelDTMFDelay->setObjectName(QString::fromUtf8("labelDTMFDelay")); - sizePolicy.setHeightForWidth(labelDTMFDelay->sizePolicy().hasHeightForWidth()); - labelDTMFDelay->setSizePolicy(sizePolicy); - labelDTMFDelay->setMinimumSize(QSize(300, 25)); - labelDTMFDelay->setMaximumSize(QSize(300, 16777215)); - labelDTMFDelay->setWordWrap(true); - - formLayoutAdvanced->setWidget(2, QFormLayout::LabelRole, labelDTMFDelay); - - labelDTMFSuffix = new QLabel(formLayoutWidget_2); - labelDTMFSuffix->setObjectName(QString::fromUtf8("labelDTMFSuffix")); - - formLayoutAdvanced->setWidget(1, QFormLayout::LabelRole, labelDTMFSuffix); - - comboBoxDTMFSuffix = new QComboBox(formLayoutWidget_2); - comboBoxDTMFSuffix->setObjectName(QString::fromUtf8("comboBoxDTMFSuffix")); - sizePolicy1.setHeightForWidth(comboBoxDTMFSuffix->sizePolicy().hasHeightForWidth()); - comboBoxDTMFSuffix->setSizePolicy(sizePolicy1); - comboBoxDTMFSuffix->setMinimumSize(QSize(50, 0)); - - formLayoutAdvanced->setWidget(1, QFormLayout::FieldRole, comboBoxDTMFSuffix); - - scrollArea->setWidget(scrollAreaWidgetContents); - ConfigWindow->setCentralWidget(centralwidget); - menubar = new QMenuBar(ConfigWindow); - menubar->setObjectName(QString::fromUtf8("menubar")); - menubar->setGeometry(QRect(0, 0, 800, 23)); - menuVicarConfiguration = new QMenu(menubar); - menuVicarConfiguration->setObjectName(QString::fromUtf8("menuVicarConfiguration")); - ConfigWindow->setMenuBar(menubar); - - menubar->addAction(menuVicarConfiguration->menuAction()); - menuVicarConfiguration->addAction(actionSave); - menuVicarConfiguration->addAction(actionReset); - - retranslateUi(ConfigWindow); - - QMetaObject::connectSlotsByName(ConfigWindow); - } // setupUi - - void retranslateUi(QMainWindow *ConfigWindow) - { - ConfigWindow->setWindowTitle(QApplication::translate("ConfigWindow", "VICaR - Settings", 0, QApplication::UnicodeUTF8)); - actionSave->setText(QApplication::translate("ConfigWindow", "Save", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionSave->setToolTip(QApplication::translate("ConfigWindow", "Save Settings", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - actionReset->setText(QApplication::translate("ConfigWindow", "Reset", 0, QApplication::UnicodeUTF8)); -#ifndef QT_NO_TOOLTIP - actionReset->setToolTip(QApplication::translate("ConfigWindow", "Reset Settings", 0, QApplication::UnicodeUTF8)); -#endif // QT_NO_TOOLTIP - groupBoxBasic->setTitle(QApplication::translate("ConfigWindow", "Basic", 0, QApplication::UnicodeUTF8)); - labelCallRedirection->setText(QApplication::translate("ConfigWindow", "International Call Routing:", 0, QApplication::UnicodeUTF8)); - checkBoxIntlCallRedirEnabled->setText(QApplication::translate("ConfigWindow", "Enabled", 0, QApplication::UnicodeUTF8)); - labelCallingCardNumber->setText(QApplication::translate("ConfigWindow", "Calling Card Number:", 0, QApplication::UnicodeUTF8)); - labelCountryCodesToExclude->setText(QApplication::translate("ConfigWindow", "Country Codes to Exclude:", 0, QApplication::UnicodeUTF8)); - groupBoxAdvanced->setTitle(QApplication::translate("ConfigWindow", "Advanced", 0, QApplication::UnicodeUTF8)); - labelDTMFFormat->setText(QApplication::translate("ConfigWindow", "Format required for DTMF tone:", 0, QApplication::UnicodeUTF8)); - comboBoxDTMFFormat->clear(); - comboBoxDTMFFormat->insertItems(0, QStringList() - << QApplication::translate("ConfigWindow", "", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "+", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "00", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "011", 0, QApplication::UnicodeUTF8) - ); - labelDTMFDelay->setText(QApplication::translate("ConfigWindow", "Delay before sending DTMF (no of pauses):", 0, QApplication::UnicodeUTF8)); - labelDTMFSuffix->setText(QApplication::translate("ConfigWindow", "Suffix after DTMF tone", 0, QApplication::UnicodeUTF8)); - comboBoxDTMFSuffix->clear(); - comboBoxDTMFSuffix->insertItems(0, QStringList() - << QApplication::translate("ConfigWindow", "--None--", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "#", 0, QApplication::UnicodeUTF8) - << QApplication::translate("ConfigWindow", "*", 0, QApplication::UnicodeUTF8) - ); - menuVicarConfiguration->setTitle(QApplication::translate("ConfigWindow", "VICaR - Configuration", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class ConfigWindow: public Ui_ConfigWindow {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_CONFIGWINDOW_H diff --git a/src/vicar-config/uis/ui_profilesettingsdialog.h b/src/vicar-config/uis/ui_profilesettingsdialog.h deleted file mode 100644 index 50cf1dd..0000000 --- a/src/vicar-config/uis/ui_profilesettingsdialog.h +++ /dev/null @@ -1,224 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'profilesettingsdialog.ui' -** -** Created: Sat Feb 26 17:43:30 2011 -** by: Qt User Interface Compiler version 4.6.2 -** -** 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, 677, 367)); - 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::ImhLowercaseOnly|Qt::ImhNoPredictiveText|Qt::ImhPreferNumbers); - - 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 047d0f6..0000000 --- a/src/vicar-config/uis/ui_profileswindow.h +++ /dev/null @@ -1,146 +0,0 @@ -/******************************************************************************** -** Form generated from reading UI file 'profileswindow.ui' -** -** Created: Sat Feb 26 17:43:29 2011 -** by: Qt User Interface Compiler version 4.6.2 -** -** 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/welcome b/welcome deleted file mode 100755 index e69de29..0000000