summaryrefslogtreecommitdiffstats
path: root/src/tork.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tork.cpp')
-rw-r--r--src/tork.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/tork.cpp b/src/tork.cpp
index 2c56e0a..00b1ae4 100644
--- a/src/tork.cpp
+++ b/src/tork.cpp
@@ -252,8 +252,8 @@ tork::tork()
const TQString&, const TQString&)));
connect(m_view->m_osd, SIGNAL(requestHideMonitor()),
this, SLOT(toggleTorMon2()));
- connect(m_view->m_osd, SIGNAL(requestToggleKDE()),
- this, SLOT(toggleKDESetting()));
+ connect(m_view->m_osd, SIGNAL(requestToggleTDE()),
+ this, SLOT(toggleTDESetting()));
connect(m_view->m_osd, SIGNAL(requestChangeID()),
this, SLOT(useNewIdentity()));
@@ -265,7 +265,7 @@ tork::tork()
connect(m_view, SIGNAL(newIdentity()),
this, SLOT(useNewIdentity()));
connect(m_view, SIGNAL(konqWithTor()),
- this, SLOT(toggleKDESettingAndLaunchKonq()));
+ this, SLOT(toggleTDESettingAndLaunchKonq()));
connect(m_view, SIGNAL(networkList()),
this, SLOT(networkList()));
connect(m_view, SIGNAL(hiddenServices()),
@@ -321,15 +321,15 @@ tork::tork()
changeStatusbar("zero","zero");
sayWhatImDoing(i18n("To connect to Tor, press play."));
showTipOnStart();
- turnOffKDE();
+ turnOffTDE();
if ((TDEApplication::kApplication()->isRestored()))
startEverything();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- if( args->isSet( "toggleKDE" ) ){
+ if( args->isSet( "toggleTDE" ) ){
startEverything();
- enableKDE(true);
+ enableTDE(true);
}
if( args->isSet( "anonymousFirefox" ) ){
@@ -488,7 +488,7 @@ void tork::shuttingDown()
KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", "TorK Has Closed And Returned "
- "KDE To Its Non-Anonymous State! Goodbye!");
+ "TDE To Its Non-Anonymous State! Goodbye!");
prepareToShut();
@@ -511,7 +511,7 @@ void tork::setupActions()
torkStop = new TDEAction(i18n("Disconnect From Tor"),"tork_stop", 0,this,
SLOT(stopTorGracefully()),actionCollection(),"stop_tor");
enableKonqi = new TDEAction(i18n("Enable/Disable Konqueror's use of Tor"),"konqueror", 0,this,
- SLOT(toggleKDESetting()),actionCollection(),"enable_konqi");
+ SLOT(toggleTDESetting()),actionCollection(),"enable_konqi");
enableTormon = new TDEAction(i18n("Toggle Tor Traffic OSD"),"tork_konsole", 0,this,
SLOT(toggleTorMon()),actionCollection(),"enable_tormon");
browseHiddenServices = new TDEAction(i18n("Browse Hidden Services"),"tork_tor", 0,this,
@@ -2043,7 +2043,7 @@ void tork::stopTor()
//timer->stop();
_tray->setPixmap(KSystemTray::loadIcon("tork_pressplay"));
changeStatusbar("zero","zero");
- turnOffKDE();
+ turnOffTDE();
m_view->m_osd->infoList->clear();
m_view->m_osd->hide();
sayWhatImDoing(i18n("To connect to Tor, press play."));
@@ -2622,7 +2622,7 @@ void tork::childExited()
browseHiddenServices->setEnabled(false);
sayWhatImDoing(i18n("To connect to Tor, press play."));
- turnOffKDE();
+ turnOffTDE();
@@ -2979,10 +2979,10 @@ void tork::startController()
m_view->welcomeitem->setEnabled(false);
_tray->setPixmap(KSystemTray::loadIcon("tork_green"));
- if( TorkConfig::alwaysAnonymizeKDE())
- enableKDE(true);
+ if( TorkConfig::alwaysAnonymizeTDE())
+ enableTDE(true);
else
- TorkConfig::setKDEUsesTor(false);
+ TorkConfig::setTDEUsesTor(false);
TorkConfig::setCurrentExcludeNodes("");
TorkConfig::setCurrentEntryNodes("");
@@ -3300,9 +3300,9 @@ void tork::runWizard()
}
-void tork::turnOffKDE()
+void tork::turnOffTDE()
{
- setKDE(false);
+ setTDE(false);
}
void tork::toggleTorBar()
@@ -3359,12 +3359,12 @@ void tork::networkList()
kapp->invokeBrowser(url.url(), "0");
}
-void tork::toggleKDESetting()
+void tork::toggleTDESetting()
{
- TorkConfig::setKDEUsesTor(!TorkConfig::kDEUsesTor());
- setKDE(TorkConfig::kDEUsesTor());
+ TorkConfig::setTDEUsesTor(!TorkConfig::tDEUsesTor());
+ setTDE(TorkConfig::tDEUsesTor());
- if (TorkConfig::kDEUsesTor())
+ if (TorkConfig::tDEUsesTor())
KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
else
KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
@@ -3374,12 +3374,12 @@ void tork::toggleKDESetting()
}
-void tork::enableKDE(bool enable)
+void tork::enableTDE(bool enable)
{
- TorkConfig::setKDEUsesTor(enable);
- setKDE(TorkConfig::kDEUsesTor());
+ TorkConfig::setTDEUsesTor(enable);
+ setTDE(TorkConfig::tDEUsesTor());
- if (TorkConfig::kDEUsesTor())
+ if (TorkConfig::tDEUsesTor())
KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("All <b>Konqueror</b> Sessions Are Now Safe for Anonymous Use. <br> <b>Amarok, Akregator, KTorrent should be treated with caution! </b><br> This is because they may have javascript/java/plugins/flash enabled."));
else
KNotifyClient::event(tdemain->_tray->winId(),"TorDisabled", i18n("<b>Konqueror</b> is Now Back to "
@@ -3389,11 +3389,11 @@ void tork::enableKDE(bool enable)
}
-void tork::toggleKDESettingAndLaunchKonq()
+void tork::toggleTDESettingAndLaunchKonq()
{
- toggleKDESetting();
+ toggleTDESetting();
- if (TorkConfig::kDEUsesTor()){
+ if (TorkConfig::tDEUsesTor()){
KRun::runCommand( "konqueror --caption \"Anonymous Browsing Session\" "
"http://healthcheck.anonymityanywhere.com/",
@@ -3403,12 +3403,12 @@ void tork::toggleKDESettingAndLaunchKonq()
}
}
-void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url)
+void tork::enableTDEAndLaunchKonqWithUrl(const TQString &url)
{
- if (!TorkConfig::kDEUsesTor())
- toggleKDESetting();
+ if (!TorkConfig::tDEUsesTor())
+ toggleTDESetting();
- if (TorkConfig::kDEUsesTor()){
+ if (TorkConfig::tDEUsesTor()){
KRun::runCommand( TQString("konqueror --caption \"Anonymous Browsing Session\" "
"%1").arg(url),
@@ -3416,12 +3416,12 @@ void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url)
}
}
-bool tork::getKDESetting()
+bool tork::getTDESetting()
{
- return TorkConfig::kDEUsesTor();
+ return TorkConfig::tDEUsesTor();
}
-void tork::setKDE(bool set)
+void tork::setTDE(bool set)
{
if (!m_view->konqitem)
@@ -3515,7 +3515,7 @@ void tork::setKDE(bool set)
if (set){
enableKonqi->setIcon("tork_konqueroroff");
- m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroroff"));
+ m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroroff"));
m_view->konqitem->setIcon("tork_konqueror_stop");
m_view->konqitem->icon->repaint();
m_view->konqitem->setDescriptionText("<qt>"+
@@ -3535,7 +3535,7 @@ void tork::setKDE(bool set)
}else{
enableKonqi->setIcon("tork_konqueroron");
- m_view->m_osd->toggleKDE->setIconSet(SmallIconSet( "tork_konqueroron"));
+ m_view->m_osd->toggleTDE->setIconSet(SmallIconSet( "tork_konqueroron"));
m_view->konqitem->setIcon("tork_konqueror_play");
m_view->konqitem->setDescriptionText("<qt>"+
i18n("<b>Click the icon to launch an anonymous "
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-07 02:18:18 +0000