diff options
Diffstat (limited to 'src/gui')
38 files changed, 61 insertions, 82 deletions
diff --git a/src/gui/address_finder.cpp b/src/gui/address_finder.cpp index 1e692e2..0aa0b2a 100644 --- a/src/gui/address_finder.cpp +++ b/src/gui/address_finder.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "address_finder.h" diff --git a/src/gui/address_finder.h b/src/gui/address_finder.h index 0872728..ec2cbf2 100644 --- a/src/gui/address_finder.h +++ b/src/gui/address_finder.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _ADDRESS_FINDER_H diff --git a/src/gui/addresscardform.cpp b/src/gui/addresscardform.cpp index e735b13..c34910c 100644 --- a/src/gui/addresscardform.cpp +++ b/src/gui/addresscardform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "gui.h" diff --git a/src/gui/addresstablemodel.cpp b/src/gui/addresstablemodel.cpp index 6a891de..620b168 100644 --- a/src/gui/addresstablemodel.cpp +++ b/src/gui/addresstablemodel.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "addresstablemodel.h" diff --git a/src/gui/addresstablemodel.h b/src/gui/addresstablemodel.h index b1c7772..177d044 100644 --- a/src/gui/addresstablemodel.h +++ b/src/gui/addresstablemodel.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _ADDRESSTABLEMODEL_H diff --git a/src/gui/authenticationform.cpp b/src/gui/authenticationform.cpp index 74933d1..f51231b 100644 --- a/src/gui/authenticationform.cpp +++ b/src/gui/authenticationform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "authenticationform.h" diff --git a/src/gui/buddyform.cpp b/src/gui/buddyform.cpp index fbbf222..b431792 100644 --- a/src/gui/buddyform.cpp +++ b/src/gui/buddyform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "gui.h" diff --git a/src/gui/buddylistview.cpp b/src/gui/buddylistview.cpp index a229e49..3991466 100644 --- a/src/gui/buddylistview.cpp +++ b/src/gui/buddylistview.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "buddylistview.h" diff --git a/src/gui/buddylistview.h b/src/gui/buddylistview.h index 8e200c7..2283f91 100644 --- a/src/gui/buddylistview.h +++ b/src/gui/buddylistview.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef BUDDYLISTVIEW_H diff --git a/src/gui/command_args.h b/src/gui/command_args.h index d792b4d..ddd0b59 100644 --- a/src/gui/command_args.h +++ b/src/gui/command_args.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _COMMAND_ARGS_H diff --git a/src/gui/diamondcardprofileform.cpp b/src/gui/diamondcardprofileform.cpp index c8d5938..6656909 100644 --- a/src/gui/diamondcardprofileform.cpp +++ b/src/gui/diamondcardprofileform.cpp @@ -16,8 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QRegExp> diff --git a/src/gui/getaddressform.cpp b/src/gui/getaddressform.cpp index 2a433a0..84698e8 100644 --- a/src/gui/getaddressform.cpp +++ b/src/gui/getaddressform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "getaddressform.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 160f982..a87315a 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "twinkle_config.h" @@ -744,6 +743,7 @@ t_gui::t_gui(t_phone *_phone) : t_userintf(_phone), timerUpdateMessageSessions(N qRegisterMetaType<t_register_type>("t_register_type"); qRegisterMetaType<t_transfer_type>("t_transfer_type"); qRegisterMetaType<t_cf_type>("t_cf_type"); + qRegisterMetaType<string>("string"); qRegisterMetaType<std::list<std::string>>("std::list<std::string>"); mainWindow = new MphoneForm; @@ -2289,16 +2289,17 @@ bool t_gui::do_cb_ask_user_to_redirect_request(t_user *user_config, const t_url return permission; } -void t_gui::cb_ask_user_to_refer(t_user *user_config, const t_url &refer_to_uri, +void t_gui::do_cb_ask_user_to_refer(t_user *user_config, const string &refer_to_uri_str, const string &refer_to_display, - const t_url &referred_by_uri, + const string &referred_by_uri_str, const string &referred_by_display) { + t_url refer_to_uri(refer_to_uri_str); + t_url referred_by_uri(referred_by_uri_str); + QString s; QString title; - lock(); - title = PRODUCT_NAME; title.append(" - ").append(qApp->translate("GUI", "Transferring call")); @@ -2333,8 +2334,19 @@ void t_gui::cb_ask_user_to_refer(t_user *user_config, const t_url &refer_to_uri, ReferPermissionDialog *dialog = new ReferPermissionDialog(mainWindow, title, s); // Do not report to MEMMAN as Qt will auto destruct this dialog on close. dialog->show(); - - unlock(); +} + +void t_gui::cb_ask_user_to_refer(t_user *user_config, const t_url &refer_to_uri, + const string &refer_to_display, + const t_url &referred_by_uri, + const string &referred_by_display) +{ + QMetaObject::invokeMethod(this, "do_cb_ask_user_to_refer", + Q_ARG(t_user*, user_config), + Q_ARG(const string&, refer_to_uri.encode()), + Q_ARG(const string&, refer_to_display), + Q_ARG(const string&, referred_by_uri.encode()), + Q_ARG(const string&, referred_by_display)); } void t_gui::cb_show_msg(const string &msg, t_msg_priority prio) { diff --git a/src/gui/gui.h b/src/gui/gui.h index db27ad0..306404f 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _GUI_H @@ -436,6 +435,10 @@ private slots: const string &display, t_method method); bool do_cb_ask_credentials(t_user *user_config, const string &realm, string &username, string &password); + void do_cb_ask_user_to_refer(t_user *user_config, const string &refer_to_uri_str, + const string &refer_to_display, + const string &referred_by_uri_str, + const string &referred_by_display); void do_cb_register_inprog(t_user *user_config, t_register_type register_type); }; diff --git a/src/gui/historyform.cpp b/src/gui/historyform.cpp index 319d6f1..2281840 100644 --- a/src/gui/historyform.cpp +++ b/src/gui/historyform.cpp @@ -17,8 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "call_history.h" diff --git a/src/gui/inviteform.cpp b/src/gui/inviteform.cpp index 204c5cd..433fb22 100644 --- a/src/gui/inviteform.cpp +++ b/src/gui/inviteform.cpp @@ -22,8 +22,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ InviteForm::InviteForm(QWidget *parent) diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 6c64185..a0f5d29 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "twinkle_config.h" diff --git a/src/gui/messageform.cpp b/src/gui/messageform.cpp index 02c7a0e..06ce7bd 100644 --- a/src/gui/messageform.cpp +++ b/src/gui/messageform.cpp @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifdef HAVE_KDE diff --git a/src/gui/messageformview.cpp b/src/gui/messageformview.cpp index 31a073c..c3a32ee 100644 --- a/src/gui/messageformview.cpp +++ b/src/gui/messageformview.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "messageformview.h" diff --git a/src/gui/messageformview.h b/src/gui/messageformview.h index 64c62c3..43f533a 100644 --- a/src/gui/messageformview.h +++ b/src/gui/messageformview.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _MESSAGEFORMVIEW_H diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp index e49306a..260fda7 100644 --- a/src/gui/mphoneform.cpp +++ b/src/gui/mphoneform.cpp @@ -20,8 +20,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "mphoneform.h" #include "twinkle_config.h" diff --git a/src/gui/qt_translator.h b/src/gui/qt_translator.h index 8f4fd23..9b85b90 100644 --- a/src/gui/qt_translator.h +++ b/src/gui/qt_translator.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _QT_TRANSLATOR_H diff --git a/src/gui/redirectform.cpp b/src/gui/redirectform.cpp index d8bc6f5..ad70cc0 100644 --- a/src/gui/redirectform.cpp +++ b/src/gui/redirectform.cpp @@ -16,8 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "audits/memman.h" diff --git a/src/gui/selectnicform.cpp b/src/gui/selectnicform.cpp index 370a6c6..8542874 100644 --- a/src/gui/selectnicform.cpp +++ b/src/gui/selectnicform.cpp @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "gui.h" diff --git a/src/gui/selectprofileform.cpp b/src/gui/selectprofileform.cpp index e648c39..7719243 100644 --- a/src/gui/selectprofileform.cpp +++ b/src/gui/selectprofileform.cpp @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QDir> diff --git a/src/gui/selectuserform.cpp b/src/gui/selectuserform.cpp index 96c9eaa..0488dc9 100644 --- a/src/gui/selectuserform.cpp +++ b/src/gui/selectuserform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QVariant> diff --git a/src/gui/sendfileform.cpp b/src/gui/sendfileform.cpp index 54b6cf3..9fd7f91 100644 --- a/src/gui/sendfileform.cpp +++ b/src/gui/sendfileform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifdef HAVE_KDE diff --git a/src/gui/srvredirectform.cpp b/src/gui/srvredirectform.cpp index dd0a429..ccf6840 100644 --- a/src/gui/srvredirectform.cpp +++ b/src/gui/srvredirectform.cpp @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "phone.h" diff --git a/src/gui/syssettingsform.cpp b/src/gui/syssettingsform.cpp index e563df0..216af54 100644 --- a/src/gui/syssettingsform.cpp +++ b/src/gui/syssettingsform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QPixmap> diff --git a/src/gui/termcapform.cpp b/src/gui/termcapform.cpp index 190a76a..679c8e7 100644 --- a/src/gui/termcapform.cpp +++ b/src/gui/termcapform.cpp @@ -14,8 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <qvariant.h> diff --git a/src/gui/textbrowsernoautolink.h b/src/gui/textbrowsernoautolink.h index 58f105e..0bf3f86 100644 --- a/src/gui/textbrowsernoautolink.h +++ b/src/gui/textbrowsernoautolink.h @@ -24,8 +24,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _TEXTBROWSERNOAUTOLINK_H diff --git a/src/gui/transferform.cpp b/src/gui/transferform.cpp index 8cab3a0..c40f487 100644 --- a/src/gui/transferform.cpp +++ b/src/gui/transferform.cpp @@ -55,8 +55,7 @@ void TransferForm::languageChange() GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ void TransferForm::init() diff --git a/src/gui/twinkleapplication.cpp b/src/gui/twinkleapplication.cpp index 4d344cb..267936d 100644 --- a/src/gui/twinkleapplication.cpp +++ b/src/gui/twinkleapplication.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "twinkleapplication.h" diff --git a/src/gui/twinkleapplication.h b/src/gui/twinkleapplication.h index e8503f8..417adcb 100644 --- a/src/gui/twinkleapplication.h +++ b/src/gui/twinkleapplication.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _TWINKLEAPPLICATION_H diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp index 788d87b..9a33ea2 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QPixmap> #include <QList> diff --git a/src/gui/wizardform.cpp b/src/gui/wizardform.cpp index d97cf49..777aa12 100644 --- a/src/gui/wizardform.cpp +++ b/src/gui/wizardform.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include <QRegExp> diff --git a/src/gui/yesnodialog.cpp b/src/gui/yesnodialog.cpp index ec1810b..0827a06 100644 --- a/src/gui/yesnodialog.cpp +++ b/src/gui/yesnodialog.cpp @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #include "yesnodialog.h" diff --git a/src/gui/yesnodialog.h b/src/gui/yesnodialog.h index c196772..c703a06 100644 --- a/src/gui/yesnodialog.h +++ b/src/gui/yesnodialog.h @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _YESNODIALOG_H |