Attachment #2500 for bug #14798

View | Details | Raw Unified | Return to bug 14798
Collapse All | Expand All

Lines 43-49 Link Here

(-)kppp.old/conwindow.cpp (-6 / +18 lines)
43	accountingEnabled(false),	43	accountingEnabled(false),
44	volumeAccountingEnabled(false)	44	volumeAccountingEnabled(false)
45	{	45	{
46	info1 = new QLabel(i18n("Connected at:"), this);	46	if (gpppdata.get_full_connect_str())
		47	info1 = new QLabel(i18n("Connection string:"), this);
		48	else
		49	info1 = new QLabel(i18n("Connected at:"), this);
47	info2 = new QLabel("", this);	50	info2 = new QLabel("", this);
48		51
49	timelabel1 = new QLabel(i18n("Time connected:"), this);	52	timelabel1 = new QLabel(i18n("Time connected:"), this);
Lines 261-271 Link Here
261		264
262		265
263	void ConWindow::timeclick() {	266	void ConWindow::timeclick() {
264	QString tooltip = i18n("Connection: %1\n"	267	QString tooltip;
265	"Connected at: %2\n"	268
266	"Time connected: %3")	269	if (gpppdata.get_full_connect_str())
267	.arg(gpppdata.accname()).arg(info2->text())	270	tooltip = i18n("Connection: %1\n"
268	.arg(time_string2);	271	"Connection string: %2\n"
		272	"Time connected: %3")
		273	.arg(gpppdata.accname()).arg(info2->text())
		274	.arg(time_string2);
		275	else
		276	tooltip = i18n("Connection: %1\n"
		277	"Connected at: %2\n"
		278	"Time connected: %3")
		279	.arg(gpppdata.accname()).arg(info2->text())
		280	.arg(time_string2);
269		281
270	if(accountingEnabled)	282	if(accountingEnabled)
271	tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")	283	tooltip += i18n("\nSession Bill: %1\nTotal Bill: %2")

Lines 159-164 Link Here

(-)kppp.old/general.cpp (+12 lines)
159	i18n("Iconifies <i>kppp</i>'s window when a\n"	159	i18n("Iconifies <i>kppp</i>'s window when a\n"
160	"connection is established"));	160	"connection is established"));
161		161
		162	chkBox = new QCheckBox(i18n("Show &full connection string"), parent);
		163	chkBox->setChecked(gpppdata.get_full_connect_str());
		164	connect(chkBox,SIGNAL(toggled(bool)),
		165	this,SLOT(full_connect_str_toggled(bool)));
		166	tl->addWidget(chkBox);
		167	QWhatsThis::add(chkBox,
		168	i18n("Show full connection string"));
		169
162	tl->addStretch();	170	tl->addStretch();
163		171
164	}	172	}
Lines 187-192 Link Here
187	gpppdata.set_redial_on_nocarrier(on);	195	gpppdata.set_redial_on_nocarrier(on);
188	}	196	}
189		197
		198	void GeneralWidget::full_connect_str_toggled(bool on){
		199	gpppdata.set_full_connect_str(on);
		200	}
		201
190	void GeneralWidget::xserver_toggled(bool on){	202	void GeneralWidget::xserver_toggled(bool on){
191	gpppdata.set_xserver_exit_disconnect(on);	203	gpppdata.set_xserver_exit_disconnect(on);
192	}	204	}

Lines 51-56 Link Here

(-)kppp.old/general.h (+1 lines)
51	void xserver_toggled(bool on);	51	void xserver_toggled(bool on);
52	void quit_toggled(bool);	52	void quit_toggled(bool);
53	void docking_toggled(bool on);	53	void docking_toggled(bool on);
		54	void full_connect_str_toggled(bool off);
54		55
55	};	56	};
56		57

Lines 445-450 Link Here

(-)kppp.old/modem.cpp (+5 lines)
445		445
446	kdDebug(5002) << "Modem reported result string: " << s << endl;	446	kdDebug(5002) << "Modem reported result string: " << s << endl;
447		447
		448	if (gpppdata.get_full_connect_str()) {
		449	result=s.mid(0, s.length()-1);
		450	return result;
		451	}
		452
448	const int RXMAX = 7;	453	const int RXMAX = 7;
449	const int TXMAX = 2;	454	const int TXMAX = 2;
450	QRegExp rrx[RXMAX] = {	455	QRegExp rrx[RXMAX] = {

Lines 299-304 Link Here

(-)kppp.old/pppdata.cpp (+6 lines)
299	return (bool) readNumConfig(GENERAL_GRP, REDIALONNOCARR_KEY, false);	299	return (bool) readNumConfig(GENERAL_GRP, REDIALONNOCARR_KEY, false);
300	}	300	}
301		301
		302	bool PPPData::get_full_connect_str() {
		303	return (bool) readNumConfig(GENERAL_GRP, FULLCONNECTSTR_KEY, false);
		304	}
302		305
303	void PPPData::setPPPDebug(bool set) {	306	void PPPData::setPPPDebug(bool set) {
304	writeConfig(GENERAL_GRP, PPP_DEBUG_OPTION, (int)set);	307	writeConfig(GENERAL_GRP, PPP_DEBUG_OPTION, (int)set);
Lines 318-323 Link Here
318	writeConfig(GENERAL_GRP, REDIALONNOCARR_KEY, (int) set);	321	writeConfig(GENERAL_GRP, REDIALONNOCARR_KEY, (int) set);
319	}	322	}
320		323
		324	void PPPData::set_full_connect_str(bool set) {
		325	writeConfig(GENERAL_GRP, FULLCONNECTSTR_KEY, (int) set);
		326	}
321		327
322	bool PPPData::quit_on_disconnect() {	328	bool PPPData::quit_on_disconnect() {
323	return (bool) readNumConfig(GENERAL_GRP, QUITONDISCONNECT_KEY, false);	329	return (bool) readNumConfig(GENERAL_GRP, QUITONDISCONNECT_KEY, false);

Lines 74-79 Link Here

(-)kppp.old/pppdata.h (+4 lines)
74	#define NUMACCOUNTS_KEY "NumberOfAccounts"	74	#define NUMACCOUNTS_KEY "NumberOfAccounts"
75	#define NUMMODEMS_KEY "NumberOfModems"	75	#define NUMMODEMS_KEY "NumberOfModems"
76	#define REDIALONNOCARR_KEY "RedialOnNoCarrier"	76	#define REDIALONNOCARR_KEY "RedialOnNoCarrier"
		77	#define FULLCONNECTSTR_KEY "FullConnectStr"
77	#define ID_KEY "ID"	78	#define ID_KEY "ID"
78		79
79	// modem	80	// modem
Lines 230-235 Link Here
230	void set_dock_into_panel(bool set);	231	void set_dock_into_panel(bool set);
231	bool get_dock_into_panel();	232	bool get_dock_into_panel();
232		233
		234	void set_full_connect_str(bool set);
		235	bool get_full_connect_str();
		236
233	const QString enter();	237	const QString enter();
234	void setEnter(const QString &);	238	void setEnter(const QString &);
235		239

Return to bug 14798