@ -252,8 +252,8 @@ tork::tork()
const TQString & , const TQString & ) ) ) ;
const TQString & , const TQString & ) ) ) ;
connect ( m_view - > m_osd , SIGNAL ( requestHideMonitor ( ) ) ,
connect ( m_view - > m_osd , SIGNAL ( requestHideMonitor ( ) ) ,
this , SLOT ( toggleTorMon2 ( ) ) ) ;
this , SLOT ( toggleTorMon2 ( ) ) ) ;
connect ( m_view - > m_osd , SIGNAL ( requestToggle K DE( ) ) ,
connect ( m_view - > m_osd , SIGNAL ( requestToggle T DE( ) ) ,
this , SLOT ( toggle K DESetting( ) ) ) ;
this , SLOT ( toggle T DESetting( ) ) ) ;
connect ( m_view - > m_osd , SIGNAL ( requestChangeID ( ) ) ,
connect ( m_view - > m_osd , SIGNAL ( requestChangeID ( ) ) ,
this , SLOT ( useNewIdentity ( ) ) ) ;
this , SLOT ( useNewIdentity ( ) ) ) ;
@ -265,7 +265,7 @@ tork::tork()
connect ( m_view , SIGNAL ( newIdentity ( ) ) ,
connect ( m_view , SIGNAL ( newIdentity ( ) ) ,
this , SLOT ( useNewIdentity ( ) ) ) ;
this , SLOT ( useNewIdentity ( ) ) ) ;
connect ( m_view , SIGNAL ( konqWithTor ( ) ) ,
connect ( m_view , SIGNAL ( konqWithTor ( ) ) ,
this , SLOT ( toggle K DESettingAndLaunchKonq( ) ) ) ;
this , SLOT ( toggle T DESettingAndLaunchKonq( ) ) ) ;
connect ( m_view , SIGNAL ( networkList ( ) ) ,
connect ( m_view , SIGNAL ( networkList ( ) ) ,
this , SLOT ( networkList ( ) ) ) ;
this , SLOT ( networkList ( ) ) ) ;
connect ( m_view , SIGNAL ( hiddenServices ( ) ) ,
connect ( m_view , SIGNAL ( hiddenServices ( ) ) ,
@ -321,15 +321,15 @@ tork::tork()
changeStatusbar ( " zero " , " zero " ) ;
changeStatusbar ( " zero " , " zero " ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
showTipOnStart ( ) ;
showTipOnStart ( ) ;
turnOff K DE( ) ;
turnOff T DE( ) ;
if ( ( TDEApplication : : kApplication ( ) - > isRestored ( ) ) )
if ( ( TDEApplication : : kApplication ( ) - > isRestored ( ) ) )
startEverything ( ) ;
startEverything ( ) ;
TDECmdLineArgs * args = TDECmdLineArgs : : parsedArgs ( ) ;
TDECmdLineArgs * args = TDECmdLineArgs : : parsedArgs ( ) ;
if ( args - > isSet ( " toggle K DE" ) ) {
if ( args - > isSet ( " toggle T DE" ) ) {
startEverything ( ) ;
startEverything ( ) ;
enable K DE( true ) ;
enable T DE( true ) ;
}
}
if ( args - > isSet ( " anonymousFirefox " ) ) {
if ( args - > isSet ( " anonymousFirefox " ) ) {
@ -488,7 +488,7 @@ void tork::shuttingDown()
KNotifyClient : : event ( tdemain - > _tray - > winId ( ) , " TorDisabled " , " TorK Has Closed And Returned "
KNotifyClient : : event ( tdemain - > _tray - > winId ( ) , " TorDisabled " , " TorK Has Closed And Returned "
" K DE To Its Non-Anonymous State! Goodbye!" ) ;
" T DE To Its Non-Anonymous State! Goodbye!" ) ;
prepareToShut ( ) ;
prepareToShut ( ) ;
@ -511,7 +511,7 @@ void tork::setupActions()
torkStop = new TDEAction ( i18n ( " Disconnect From Tor " ) , " tork_stop " , 0 , this ,
torkStop = new TDEAction ( i18n ( " Disconnect From Tor " ) , " tork_stop " , 0 , this ,
SLOT ( stopTorGracefully ( ) ) , actionCollection ( ) , " stop_tor " ) ;
SLOT ( stopTorGracefully ( ) ) , actionCollection ( ) , " stop_tor " ) ;
enableKonqi = new TDEAction ( i18n ( " Enable/Disable Konqueror's use of Tor " ) , " konqueror " , 0 , this ,
enableKonqi = new TDEAction ( i18n ( " Enable/Disable Konqueror's use of Tor " ) , " konqueror " , 0 , this ,
SLOT ( toggle K DESetting( ) ) , actionCollection ( ) , " enable_konqi " ) ;
SLOT ( toggle T DESetting( ) ) , actionCollection ( ) , " enable_konqi " ) ;
enableTormon = new TDEAction ( i18n ( " Toggle Tor Traffic OSD " ) , " tork_konsole " , 0 , this ,
enableTormon = new TDEAction ( i18n ( " Toggle Tor Traffic OSD " ) , " tork_konsole " , 0 , this ,
SLOT ( toggleTorMon ( ) ) , actionCollection ( ) , " enable_tormon " ) ;
SLOT ( toggleTorMon ( ) ) , actionCollection ( ) , " enable_tormon " ) ;
browseHiddenServices = new TDEAction ( i18n ( " Browse Hidden Services " ) , " tork_tor " , 0 , this ,
browseHiddenServices = new TDEAction ( i18n ( " Browse Hidden Services " ) , " tork_tor " , 0 , this ,
@ -2043,7 +2043,7 @@ void tork::stopTor()
//timer->stop();
//timer->stop();
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_pressplay " ) ) ;
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_pressplay " ) ) ;
changeStatusbar ( " zero " , " zero " ) ;
changeStatusbar ( " zero " , " zero " ) ;
turnOff K DE( ) ;
turnOff T DE( ) ;
m_view - > m_osd - > infoList - > clear ( ) ;
m_view - > m_osd - > infoList - > clear ( ) ;
m_view - > m_osd - > hide ( ) ;
m_view - > m_osd - > hide ( ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
@ -2622,7 +2622,7 @@ void tork::childExited()
browseHiddenServices - > setEnabled ( false ) ;
browseHiddenServices - > setEnabled ( false ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
sayWhatImDoing ( i18n ( " To connect to Tor, press play. " ) ) ;
turnOff K DE( ) ;
turnOff T DE( ) ;
@ -2979,10 +2979,10 @@ void tork::startController()
m_view - > welcomeitem - > setEnabled ( false ) ;
m_view - > welcomeitem - > setEnabled ( false ) ;
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_green " ) ) ;
_tray - > setPixmap ( KSystemTray : : loadIcon ( " tork_green " ) ) ;
if ( TorkConfig : : alwaysAnonymize K DE( ) )
if ( TorkConfig : : alwaysAnonymize T DE( ) )
enable K DE( true ) ;
enable T DE( true ) ;
else
else
TorkConfig : : set K DEUsesTor( false ) ;
TorkConfig : : set T DEUsesTor( false ) ;
TorkConfig : : setCurrentExcludeNodes ( " " ) ;
TorkConfig : : setCurrentExcludeNodes ( " " ) ;
TorkConfig : : setCurrentEntryNodes ( " " ) ;
TorkConfig : : setCurrentEntryNodes ( " " ) ;
@ -3300,9 +3300,9 @@ void tork::runWizard()
} }
void tork : : turnOff K DE( ) void tork : : turnOff T DE( )
{ {
set K DE( false ) ;
set T DE( false ) ;
} }
void tork : : toggleTorBar ( ) void tork : : toggleTorBar ( )
@ -3359,12 +3359,12 @@ void tork::networkList()
kapp - > invokeBrowser ( url . url ( ) , " 0 " ) ;
kapp - > invokeBrowser ( url . url ( ) , " 0 " ) ;
} }
void tork : : toggle K DESetting( ) void tork : : toggle T DESetting( )
{ {
TorkConfig : : set KDEUsesTor( ! TorkConfig : : k DEUsesTor( ) ) ;
TorkConfig : : set TDEUsesTor( ! TorkConfig : : t DEUsesTor( ) ) ;
set KDE( TorkConfig : : k DEUsesTor( ) ) ;
set TDE( TorkConfig : : t DEUsesTor( ) ) ;
if ( TorkConfig : : k DEUsesTor( ) )
if ( TorkConfig : : t DEUsesTor( ) )
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. " ) ) ;
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
else
KNotifyClient : : event ( tdemain - > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
KNotifyClient : : event ( tdemain - > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
@ -3374,12 +3374,12 @@ void tork::toggleKDESetting()
} }
void tork : : enable K DE( bool enable ) void tork : : enable T DE( bool enable )
{ {
TorkConfig : : set K DEUsesTor( enable ) ;
TorkConfig : : set T DEUsesTor( enable ) ;
set KDE( TorkConfig : : k DEUsesTor( ) ) ;
set TDE( TorkConfig : : t DEUsesTor( ) ) ;
if ( TorkConfig : : k DEUsesTor( ) )
if ( TorkConfig : : t DEUsesTor( ) )
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. " ) ) ;
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
else
KNotifyClient : : event ( tdemain - > _tray - > winId ( ) , " TorDisabled " , i18n ( " <b>Konqueror</b> is Now Back to "
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 : : toggle K DESettingAndLaunchKonq( ) void tork : : toggle T DESettingAndLaunchKonq( )
{ {
toggle K DESetting( ) ;
toggle T DESetting( ) ;
if ( TorkConfig : : k DEUsesTor( ) ) {
if ( TorkConfig : : t DEUsesTor( ) ) {
KRun : : runCommand ( " konqueror --caption \" Anonymous Browsing Session \" "
KRun : : runCommand ( " konqueror --caption \" Anonymous Browsing Session \" "
" http://healthcheck.anonymityanywhere.com/ " ,
" http://healthcheck.anonymityanywhere.com/ " ,
@ -3403,12 +3403,12 @@ void tork::toggleKDESettingAndLaunchKonq()
}
}
} }
void tork : : enable K DEAndLaunchKonqWithUrl( const TQString & url ) void tork : : enable T DEAndLaunchKonqWithUrl( const TQString & url )
{ {
if ( ! TorkConfig : : k DEUsesTor( ) )
if ( ! TorkConfig : : t DEUsesTor( ) )
toggle K DESetting( ) ;
toggle T DESetting( ) ;
if ( TorkConfig : : k DEUsesTor( ) ) {
if ( TorkConfig : : t DEUsesTor( ) ) {
KRun : : runCommand ( TQString ( " konqueror --caption \" Anonymous Browsing Session \" "
KRun : : runCommand ( TQString ( " konqueror --caption \" Anonymous Browsing Session \" "
" %1 " ) . arg ( url ) ,
" %1 " ) . arg ( url ) ,
@ -3416,12 +3416,12 @@ void tork::enableKDEAndLaunchKonqWithUrl(const TQString &url)
}
}
} }
bool tork : : get K DESetting( ) bool tork : : get T DESetting( )
{ {
return TorkConfig : : k DEUsesTor( ) ;
return TorkConfig : : t DEUsesTor( ) ;
} }
void tork : : set K DE( bool set ) void tork : : set T DE( bool set )
{ {
if ( ! m_view - > konqitem )
if ( ! m_view - > konqitem )
@ -3515,7 +3515,7 @@ void tork::setKDE(bool set)
if ( set ) {
if ( set ) {
enableKonqi - > setIcon ( " tork_konqueroroff " ) ;
enableKonqi - > setIcon ( " tork_konqueroroff " ) ;
m_view - > m_osd - > toggle K DE- > setIconSet ( SmallIconSet ( " tork_konqueroroff " ) ) ;
m_view - > m_osd - > toggle T DE- > setIconSet ( SmallIconSet ( " tork_konqueroroff " ) ) ;
m_view - > konqitem - > setIcon ( " tork_konqueror_stop " ) ;
m_view - > konqitem - > setIcon ( " tork_konqueror_stop " ) ;
m_view - > konqitem - > icon - > repaint ( ) ;
m_view - > konqitem - > icon - > repaint ( ) ;
m_view - > konqitem - > setDescriptionText ( " <qt> " +
m_view - > konqitem - > setDescriptionText ( " <qt> " +
@ -3535,7 +3535,7 @@ void tork::setKDE(bool set)
} else {
} else {
enableKonqi - > setIcon ( " tork_konqueroron " ) ;
enableKonqi - > setIcon ( " tork_konqueroron " ) ;
m_view - > m_osd - > toggle K DE- > setIconSet ( SmallIconSet ( " tork_konqueroron " ) ) ;
m_view - > m_osd - > toggle T DE- > setIconSet ( SmallIconSet ( " tork_konqueroron " ) ) ;
m_view - > konqitem - > setIcon ( " tork_konqueror_play " ) ;
m_view - > konqitem - > setIcon ( " tork_konqueror_play " ) ;
m_view - > konqitem - > setDescriptionText ( " <qt> " +
m_view - > konqitem - > setDescriptionText ( " <qt> " +
i18n ( " <b>Click the icon to launch an anonymous "
i18n ( " <b>Click the icon to launch an anonymous "
Darrell Anderson
11 years ago