[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/make_kget_cool/kget
From: Urs Wolfer <uwolfer () fwo ! ch>
Date: 2006-07-31 23:42:54
Message-ID: 1154389374.479622.1806.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 568387 by uwolfer:
some small fixes (correct a few KGet->MainWindow replacements)
M +10 -10 main.cpp
M +10 -10 mainwindow.cpp
M +2 -2 mainwindow.h
M +1 -1 sounds/kget.notifyrc
--- branches/work/make_kget_cool/kget/main.cpp #568386:568387
@@ -33,7 +33,7 @@
static const char version[] = KGETVERSION;
static KCmdLineOptions option[] = {
- { "showDropTarget", I18N_NOOP("Start MainWindow with drop target"), 0 },
+ { "showDropTarget", I18N_NOOP("Start KGet with drop target"), 0 },
{ "+[URL(s)]", I18N_NOOP("URL(s) to download"), 0},
KCmdLineLastOption
};
@@ -58,10 +58,10 @@
static void signalHandler(int sigId)
{
- fprintf(stderr, "*** MainWindow got signal %d\n", sigId);
+ fprintf(stderr, "*** KGet got signal %d\n", sigId);
if (sigId != SIGSEGV) {
- fprintf(stderr, "*** MainWindow saving data\n");
+ fprintf(stderr, "*** KGet saving data\n");
//FIXME delete kmain;
}
// If Kget crashes again below this line we consider the data lost :-|
@@ -72,16 +72,16 @@
}
-class MainWindowApp : public KUniqueApplication
+class KGetApp : public KUniqueApplication
{
public:
- MainWindowApp()
+ KGetApp()
: KUniqueApplication(), kget( 0 ), osd( 0 )
{
showSplash();
}
- ~MainWindowApp()
+ ~KGetApp()
{
delete osd;
delete kget;
@@ -151,7 +151,7 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData("kget", I18N_NOOP("MainWindow"), version, description,
+ KAboutData aboutData("kget", I18N_NOOP("KGet"), version, description,
KAboutData::License_GPL,
I18N_NOOP("(C) 2001 - 2002, Patrick Charbonnier\n"
"(C) 2002, Carsten Pfeiffer\n"
@@ -165,14 +165,14 @@
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(option);
- MainWindowApp::addCmdLineOptions();
+ KGetApp::addCmdLineOptions();
- if (!MainWindowApp::start()) {
+ if (!KGetApp::start()) {
fprintf(stderr, "kget is already running!\n");
exit(0);
}
- MainWindowApp kApp;
+ KGetApp kApp;
//setSignalHandler(signalHandler);
--- branches/work/make_kget_cool/kget/mainwindow.cpp #568386:568387
@@ -132,18 +132,18 @@
connect(m_AutoPaste, SIGNAL(triggered(bool)), SLOT(slotToggleAutoPaste()));
m_AutoPaste->setChecked(Settings::autoPaste());
m_AutoPaste->setWhatsThis(i18n("<b>Auto paste</b> button toggles the auto-paste \
mode "
- "on and off.\nWhen set, MainWindow will \
periodically scan the clipboard " + "on and \
off.\nWhen set, KGet will periodically scan the clipboard "
"for URLs and paste them automatically."));
m_showDropTarget = new KToggleAction( KIcon("tool_drop_target"), i18n("Show \
Drop Target"), ac, "show_drop_target" );
connect(m_showDropTarget, SIGNAL(triggered(bool)), SLOT(slotShowDropTarget()));
- m_KonquerorIntegration = new KAction( KIcon("konqueror"), i18n("Enable \
MainWindow as Konqueror Download Manager"), + m_KonquerorIntegration = new \
KAction( KIcon("konqueror"), i18n("Enable KGet as Konqueror Download Manager"), ac, \
"konqueror_integration" );
connect(m_KonquerorIntegration, SIGNAL(triggered(bool)), \
SLOT(slotTrayKonquerorIntegration())); if (Settings::konquerorIntegration())
- m_KonquerorIntegration->setText(i18n("Disable &MainWindow as Konqueror \
Download Manager")); + m_KonquerorIntegration->setText(i18n("Disable &KGet as \
Konqueror Download Manager")); \
slotKonquerorIntegration(Settings::konquerorIntegration());
// local - Destroys all sub-windows and exits
@@ -275,7 +275,7 @@
// {
// if (KMessageBox::warningYesNo(this,
// i18n("Some transfers are still running.\n"
-// "Are you sure you want to close MainWindow?"),
+// "Are you sure you want to close KGet?"),
// i18n("Warning"), KStdGuiItem::yes(), KStdGuiItem::no(),
// "ExitWithActiveTransfers") == KMessageBox::No)
// return;
@@ -306,7 +306,7 @@
{
QString filename = KFileDialog::getSaveFileName
(KUrl(),
- "*.kgt|" + i18n("MainWindow transfer list") + " (*.kgt)",
+ "*.kgt|" + i18n("KGet transfer list") + " (*.kgt)",
this,
i18n("Export transfers")
);
@@ -474,7 +474,7 @@
if (!tempIntegration && Settings::konquerorIntegration() && \
!Settings::expertMode()) {
KMessageBox::information(0,
- i18n("MainWindow has been temporarily disabled as download manager for \
Konqueror. " + i18n("KGet has been temporarily disabled as download \
manager for Konqueror. "
"If you want to disable it forever, go to Settings->Advanced and disable \
\"Use " "as download manager for Konqueror\"."),
i18n("Konqueror Integration disabled"),
@@ -489,9 +489,9 @@
cfgKonqueror.writePathEntry("DownloadManager",QString(konquerorIntegration?"kget":""));
cfgKonqueror.sync();
if ( konquerorIntegration )
- m_KonquerorIntegration->setText(i18n("Disable &MainWindow as Konqueror \
Download Manager")); + m_KonquerorIntegration->setText(i18n("Disable &KGet as \
Konqueror Download Manager")); else
- m_KonquerorIntegration->setText(i18n("Enable &MainWindow as Konqueror \
Download Manager")); + m_KonquerorIntegration->setText(i18n("Enable &KGet as \
Konqueror Download Manager")); }
void MainWindow::slotShowMenubar()
@@ -577,7 +577,7 @@
/*
KToggleAction *m_paAutoDisconnect,
m_paAutoDisconnect = new KToggleAction(i18n("Auto-&Disconnect \
Mode"),"connect_creating", 0, this, SLOT(slotToggleAutoDisconnect()), ac, \
"auto_disconnect");
- tmp = i18n("<b>Auto disconnect</b> button toggles the auto-disconnect\n" "mode \
on and off.\n" "\n" "When set, MainWindow will disconnect automatically\n" "after all \
queued transfers are finished.\n" "\n" "<b>Important!</b>\n" "Also turn on the expert \
mode when you want MainWindow\n" "to disconnect without asking."); + tmp = \
i18n("<b>Auto disconnect</b> button toggles the auto-disconnect\n" "mode on and \
off.\n" "\n" "When set, KGet will disconnect automatically\n" "after all queued \
transfers are finished.\n" "\n" "<b>Important!</b>\n" "Also turn on the expert mode \
when you want KGet\n" "to disconnect without asking."); \
m_paAutoDisconnect->setWhatsThis(tmp);
if (Settings::connectionType() != Settings::Permanent) {
@@ -710,7 +710,7 @@
/*
KToggleAction *m_paExpertMode, *m_paUseLastDir
m_paUseLastDir = new KToggleAction(i18n("&Use-Last-Folder Mode"),"folder", \
0, this, SLOT(slotToggleUseLastDir()), ac, "use_last_dir");
- m_paUseLastDir->setWhatsThis(i18n("<b>Use last folder</b> button toggles the\n" \
"use-last-folder feature on and off.\n" "\n" "When set, MainWindow will ignore the \
folder settings\n" "and put all new added transfers into the folder\n" "where the \
last transfer was put.")); + m_paUseLastDir->setWhatsThis(i18n("<b>Use last \
folder</b> button toggles the\n" "use-last-folder feature on and off.\n" "\n" "When \
set, KGet will ignore the folder settings\n" "and put all new added transfers into \
the folder\n" "where the last transfer was put.")); \
m_paUseLastDir->setChecked(Settings::useLastDir());
void slotToggleUseLastDir();
--- branches/work/make_kget_cool/kget/mainwindow.h #568386:568387
@@ -25,7 +25,7 @@
class Tray;
/**
- * The main window of MainWindow.
+ * The main window of KGet.
*
* Can be collapsed or expanded.
*/
@@ -37,7 +37,7 @@
~MainWindow();
protected:
- // from the DCOP interface
+ // from the DBUS interface
virtual void addTransfers( const KUrl::List& src, const QString& destDir = \
QString() ); virtual bool isDropTargetVisible() const;
virtual void setDropTargetVisible( bool setVisible );
--- branches/work/make_kget_cool/kget/sounds/kget.notifyrc #568386:568387
@@ -21,7 +21,7 @@
Action=Sound
[Event/finishedall]
-Name=AddDownloadsFinished
+Name=AllDownloadsFinished
Comment=All downloads finished
Sound=KGet_Finished_All.ogg
Action=Sound
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic