From 63b34dc6ccd32c9bc7c3d8c0137ff12530238bde Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 30 Oct 2008 01:50:51 +0100 Subject: reKonq initial commit. Yeah! --- src/main.cpp | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 src/main.cpp (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 00000000..ae4c2173 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,57 @@ +/* ============================================================ + * + * This file is a part of the reKonq project + * + * Copyright (C) 2008 by Andrea Diamantini + * + * + * This program is free software; you can redistribute it + * and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; + * either version 2, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * ============================================================ */ + + +#include +#include + +#include "browserapplication.h" + +int main(int argc, char **argv) +{ + KAboutData aboutData( + "reKonq", + 0, + ki18n("reKonq"), + "0.0.1", + ki18n("A KDE browser webkit based"), + KAboutData::License_GPL, + ki18n("Copyright (c) 2008 Andrea Diamantini"), + KLocalizedString(), + "http://www.adjam.org", + "adjam7@gmail.com" // bug report mail + ); + + aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("reKonq author"), "adjam7@gmail.com"); + aboutData.setProgramIconName("application-internet"); + + KCmdLineArgs::init( argc, argv, &aboutData ); + KCmdLineOptions options; + + //TODO make this work + options.add("+URL", ki18n("Location to open")); + KCmdLineArgs::addCmdLineOptions( options ); + + BrowserApplication app(argc, argv); + if (!app.isTheOnlyBrowser()) + return 0; + app.newMainWindow(); + return app.exec(); +} + -- cgit v1.2.1 From a01d13f45b6ccd3a64e7a2cf18996d9bf841d4d9 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 30 Oct 2008 19:07:58 +0100 Subject: QApplication --> KApplication --- src/main.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ae4c2173..badfd296 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,11 +18,13 @@  * ============================================================ */ +#include "browserapplication.h" + #include #include -#include "browserapplication.h" +// really simple writing main files today.. int main(int argc, char **argv) { KAboutData aboutData( @@ -42,13 +44,14 @@ int main(int argc, char **argv) aboutData.setProgramIconName("application-internet"); KCmdLineArgs::init( argc, argv, &aboutData ); + KCmdLineOptions options; - - //TODO make this work options.add("+URL", ki18n("Location to open")); KCmdLineArgs::addCmdLineOptions( options ); - BrowserApplication app(argc, argv); + KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + + BrowserApplication app(args, "reKonq"); if (!app.isTheOnlyBrowser()) return 0; app.newMainWindow(); -- cgit v1.2.1 From 2147abb0c02358b512925191d3e545574ec80e08 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 1 Nov 2008 13:04:26 +0100 Subject: Localizing strings.. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index badfd296..d99226cf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) ); aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("reKonq author"), "adjam7@gmail.com"); - aboutData.setProgramIconName("application-internet"); + aboutData.setProgramIconName("applications-internet"); KCmdLineArgs::init( argc, argv, &aboutData ); -- cgit v1.2.1 From 4a0acb308cfecde67af334f48a521c221c4aee1a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 7 Nov 2008 00:17:56 +0100 Subject: Setting right license --- src/main.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d99226cf..304c2301 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,7 @@  *  * This file is a part of the reKonq project  * + * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved * Copyright (C) 2008 by Andrea Diamantini  * * -- cgit v1.2.1 From 19e901a0ca9630b2003dd24ccfa6da54eb70bb09 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 14 Dec 2008 18:27:17 +0100 Subject: adjusted rekonq name commented out (hopefully, for now) resizeEvents and focusInEvents in urlbar & searchbar --- src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 304c2301..e2f74b4d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ /* ============================================================  * - * This file is a part of the reKonq project + * This file is a part of the rekonq project  * * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved * Copyright (C) 2008 by Andrea Diamantini @@ -29,9 +29,9 @@ int main(int argc, char **argv) { KAboutData aboutData( - "reKonq", + "rekonq", 0, - ki18n("reKonq"), + ki18n("rekonq"), "0.0.1", ki18n("A KDE browser webkit based"), KAboutData::License_GPL, @@ -41,7 +41,7 @@ int main(int argc, char **argv) "adjam7@gmail.com" // bug report mail ); - aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("reKonq author"), "adjam7@gmail.com"); + aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("rekonq author"), "adjam7@gmail.com"); aboutData.setProgramIconName("applications-internet"); KCmdLineArgs::init( argc, argv, &aboutData ); @@ -52,7 +52,7 @@ int main(int argc, char **argv) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - BrowserApplication app(args, "reKonq"); + BrowserApplication app(args, "rekonq"); if (!app.isTheOnlyBrowser()) return 0; app.newMainWindow(); -- cgit v1.2.1 From 0dc1272340d4deda7f9b07c5278fac9e04383b18 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Thu, 18 Dec 2008 02:51:24 +0100 Subject: Lots of improvements in save/restore state functions. - saving toolbar lock - removing unuseful save/restore tabWidget functions - saving navigation toolbar settings --- src/main.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e2f74b4d..7963405d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,13 +41,18 @@ int main(int argc, char **argv) "adjam7@gmail.com" // bug report mail ); - aboutData.addAuthor(ki18n("Andrea Diamantini"), ki18n("rekonq author"), "adjam7@gmail.com"); + aboutData.addAuthor( + ki18n("Andrea Diamantini"), + ki18n("rekonq author"), + "adjam7@gmail.com" + ); + aboutData.setProgramIconName("applications-internet"); KCmdLineArgs::init( argc, argv, &aboutData ); KCmdLineOptions options; - options.add("+URL", ki18n("Location to open")); + options.add( "+URL" , ki18n("Location to open") ); KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); -- cgit v1.2.1 From 9e7f74269e25062a33af0a2603bf258cd4b228e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 29 Dec 2008 01:52:07 +0100 Subject: Ported from KMainWindow to KXmlGuiWindow. Yeah! .. --- src/main.cpp | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 7963405d..fb9bf3de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,33 +24,32 @@ #include #include +static const char description[] = + I18N_NOOP("KDE Browser Webkit Based"); + +static const char version[] = "0.0.2"; -// really simple writing main files today.. int main(int argc, char **argv) { - KAboutData aboutData( - "rekonq", - 0, - ki18n("rekonq"), - "0.0.1", - ki18n("A KDE browser webkit based"), - KAboutData::License_GPL, - ki18n("Copyright (c) 2008 Andrea Diamantini"), - KLocalizedString(), - "http://www.adjam.org", - "adjam7@gmail.com" // bug report mail - ); + KAboutData about( "rekonq", + 0, + ki18n("rekonq"), + version, + ki18n(description), + KAboutData::License_GPL, + ki18n("(C) 2008 Andrea Diamantini"), + KLocalizedString(), + "http://www.adjam.org", + "adjam7@gmail.com" + ); + + about.addAuthor( ki18n("Andrea Diamantini"), + KLocalizedString(), + "adjam7@gmail.com" + ); - aboutData.addAuthor( - ki18n("Andrea Diamantini"), - ki18n("rekonq author"), - "adjam7@gmail.com" - ); - - aboutData.setProgramIconName("applications-internet"); + KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineOptions options; options.add( "+URL" , ki18n("Location to open") ); KCmdLineArgs::addCmdLineOptions( options ); -- cgit v1.2.1 From 9cbf281f4df98feec4325dac050cc633e3bbfe2f Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 30 Dec 2008 16:52:23 +0100 Subject: Fixed FindBar crash && refactored to look like kate searchbar --- src/main.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index fb9bf3de..0988b367 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,21 +32,21 @@ static const char version[] = "0.0.2"; int main(int argc, char **argv) { KAboutData about( "rekonq", - 0, - ki18n("rekonq"), - version, - ki18n(description), - KAboutData::License_GPL, - ki18n("(C) 2008 Andrea Diamantini"), - KLocalizedString(), - "http://www.adjam.org", - "adjam7@gmail.com" - ); + 0, + ki18n("rekonq"), + version, + ki18n(description), + KAboutData::License_GPL, + ki18n("(C) 2008 Andrea Diamantini"), + KLocalizedString(), + "http://www.adjam.org", + "adjam7@gmail.com" + ); - about.addAuthor( ki18n("Andrea Diamantini"), - KLocalizedString(), - "adjam7@gmail.com" - ); + about.addAuthor( ki18n("Andrea Diamantini"), + KLocalizedString(), + "adjam7@gmail.com" + ); KCmdLineArgs::init(argc, argv, &about); -- cgit v1.2.1 From 412075ca56dc2182ea12dcd52e6cce5396575ae8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 31 Dec 2008 00:39:09 +0100 Subject: New rekonq site --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 0988b367..e53eef3c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) KAboutData::License_GPL, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), - "http://www.adjam.org", + "http://rekonq.adjam.org", "adjam7@gmail.com" ); -- cgit v1.2.1 From 641b34b0c2de8ccdf250bc8a8d95cfb0ea4a1f45 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 2 Feb 2009 01:56:58 +0100 Subject: rekonq 0.0.3 --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e53eef3c..5fc3d30e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,7 +27,7 @@ static const char description[] = I18N_NOOP("KDE Browser Webkit Based"); -static const char version[] = "0.0.2"; +static const char version[] = "0.0.3"; int main(int argc, char **argv) { -- cgit v1.2.1 From f7792e37654fb9d0509171d946d53e7697ad53e8 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 15 Feb 2009 15:35:47 +0100 Subject: BrowserApplication --> Application --- src/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e53eef3c..c3ac0c00 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -19,7 +19,7 @@  * ============================================================ */ -#include "browserapplication.h" +#include "application.h" #include #include @@ -56,7 +56,7 @@ int main(int argc, char **argv) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - BrowserApplication app(args, "rekonq"); + Application app(args, "rekonq"); if (!app.isTheOnlyBrowser()) return 0; app.newMainWindow(); -- cgit v1.2.1 From 4150695c5fff0504cf19ad74b3f185bd67397497 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 16 Feb 2009 00:06:28 +0100 Subject: new singleton Application class. Try 1.. --- src/main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 9a779783..a97bb0d5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,11 +23,12 @@ #include #include +#include static const char description[] = I18N_NOOP("KDE Browser Webkit Based"); -static const char version[] = "0.0.3"; +static const char version[] = "0.0.4"; int main(int argc, char **argv) { @@ -53,13 +54,14 @@ int main(int argc, char **argv) KCmdLineOptions options; options.add( "+URL" , ki18n("Location to open") ); KCmdLineArgs::addCmdLineOptions( options ); + Application::addCmdLineOptions(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - - Application app(args, "rekonq"); - if (!app.isTheOnlyBrowser()) - return 0; - app.newMainWindow(); + if (!Application::start()) + { + kWarning() << "rekonq is already running!"; + return 0; + } + Application app; return app.exec(); } -- cgit v1.2.1 From 84a93ab8a47c8e4546ae658b5400623cdccfe237 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 16 Mar 2009 15:45:45 +0100 Subject: updated rekonq site fixed tab actions.. really near rekonq 0.0.4! Perhaps this night!! --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index a97bb0d5..5315a1d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) KAboutData::License_GPL, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), - "http://rekonq.adjam.org", + "http://rekonq.soourceforge.net", "adjam7@gmail.com" ); -- cgit v1.2.1 From 5c64bca9fa0ef91aa062294a8d89aa64df6e82b4 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 17 Mar 2009 15:54:19 +0100 Subject: Fixed rekonq site URL --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 5315a1d2..48992561 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) KAboutData::License_GPL, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), - "http://rekonq.soourceforge.net", + "http://rekonq.sourceforge.net", "adjam7@gmail.com" ); -- cgit v1.2.1 From 39409ac6a2880ad815d6096231d0fcdcfd2547f6 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 22 Mar 2009 10:21:09 +0100 Subject: Fixed Copyright intro --- src/main.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 48992561..110188e4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,22 +1,22 @@ /* ============================================================ - * - * This file is a part of the rekonq project - * - * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved - * Copyright (C) 2008 by Andrea Diamantini - * - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software Foundation; - * either version 2, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the - * GNU General Public License for more details. - * - * ============================================================ */ +* +* This file is a part of the rekonq project +* +* Copyright (C) 2008 by Andrea Diamantini +* +* +* This program is free software; you can redistribute it +* and/or modify it under the terms of the GNU General +* Public License as published by the Free Software Foundation; +* either version 2, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* ============================================================ */ + #include "application.h" @@ -28,7 +28,7 @@ static const char description[] = I18N_NOOP("KDE Browser Webkit Based"); -static const char version[] = "0.0.4"; +static const char version[] = "0.0.5"; int main(int argc, char **argv) { -- cgit v1.2.1 From 1132e1a3b95726f0e2da5c361524eff6c59df1ee Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 24 Mar 2009 17:43:34 +0100 Subject: Fixed notFound.html page --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 110188e4..71f5792d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,18 +18,20 @@ * ============================================================ */ - #include "application.h" #include #include #include + static const char description[] = I18N_NOOP("KDE Browser Webkit Based"); + static const char version[] = "0.0.5"; + int main(int argc, char **argv) { KAboutData about( "rekonq", -- cgit v1.2.1 From a934072cf9695e46e793898102590322f43c0733 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 15:53:26 +0100 Subject: astyle. First round.. --- src/main.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 71f5792d..9248aa14 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,34 +34,34 @@ static const char version[] = "0.0.5"; int main(int argc, char **argv) { - KAboutData about( "rekonq", - 0, - ki18n("rekonq"), - version, - ki18n(description), - KAboutData::License_GPL, - ki18n("(C) 2008 Andrea Diamantini"), - KLocalizedString(), - "http://rekonq.sourceforge.net", - "adjam7@gmail.com" + KAboutData about("rekonq", + 0, + ki18n("rekonq"), + version, + ki18n(description), + KAboutData::License_GPL, + ki18n("(C) 2008 Andrea Diamantini"), + KLocalizedString(), + "http://rekonq.sourceforge.net", + "adjam7@gmail.com" ); - about.addAuthor( ki18n("Andrea Diamantini"), - KLocalizedString(), - "adjam7@gmail.com" + about.addAuthor(ki18n("Andrea Diamantini"), + KLocalizedString(), + "adjam7@gmail.com" ); KCmdLineArgs::init(argc, argv, &about); KCmdLineOptions options; - options.add( "+URL" , ki18n("Location to open") ); - KCmdLineArgs::addCmdLineOptions( options ); + options.add("+URL" , ki18n("Location to open")); + KCmdLineArgs::addCmdLineOptions(options); Application::addCmdLineOptions(); - if (!Application::start()) + if (!Application::start()) { - kWarning() << "rekonq is already running!"; - return 0; + kWarning() << "rekonq is already running!"; + return 0; } Application app; return app.exec(); -- cgit v1.2.1 From 651f97d0652e90ab1af4e80418f42468cc5932e2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 23:46:38 +0100 Subject: pedantic --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 9248aa14..b7cfbb3b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) ki18n("rekonq"), version, ki18n(description), - KAboutData::License_GPL, + KAboutData::License_GPL_V3, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), "http://rekonq.sourceforge.net", -- cgit v1.2.1 From 98f53721514116b876d18bf0a2da89d2a53cc97d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:05:45 +0100 Subject: Revert "pedantic" Too much things committed a time.. This reverts commit 651f97d0652e90ab1af4e80418f42468cc5932e2. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index b7cfbb3b..9248aa14 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) ki18n("rekonq"), version, ki18n(description), - KAboutData::License_GPL_V3, + KAboutData::License_GPL, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), "http://rekonq.sourceforge.net", -- cgit v1.2.1 From 08deb6b161ef0cdda7ed8e49870b16f41d78eb4e Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 29 Mar 2009 00:13:01 +0100 Subject: Revert "Revert "pedantic"" Reapplied previous changes. Sorry for confusion. Time to bed.. This reverts commit 98f53721514116b876d18bf0a2da89d2a53cc97d. --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 9248aa14..b7cfbb3b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) ki18n("rekonq"), version, ki18n(description), - KAboutData::License_GPL, + KAboutData::License_GPL_V3, ki18n("(C) 2008 Andrea Diamantini"), KLocalizedString(), "http://rekonq.sourceforge.net", -- cgit v1.2.1 From eeff2aa63a3006167542071bd19dd44ffbed8ba2 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 3 Apr 2009 01:45:09 +0200 Subject: Added Comments in main.cpp Fixed loading external sites on new tabs. This costs us a forced initial resizing.. that could be payed (perhaps..)! --- src/main.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index b7cfbb3b..630c38d7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,11 +51,19 @@ int main(int argc, char **argv) "adjam7@gmail.com" ); + // Initialize command line args KCmdLineArgs::init(argc, argv, &about); + // Define the command line options using KCmdLineOptions KCmdLineOptions options; - options.add("+URL" , ki18n("Location to open")); + + // adding URL option + options.add("+[URL]" , ki18n("Location to open")); + + // Register the supported options KCmdLineArgs::addCmdLineOptions(options); + + // Add options from Application class Application::addCmdLineOptions(); if (!Application::start()) @@ -63,6 +71,7 @@ int main(int argc, char **argv) kWarning() << "rekonq is already running!"; return 0; } + Application app; return app.exec(); } -- cgit v1.2.1 From db75cbfd9bbb52858d6434e96ac914424a66fe09 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:24:48 +0200 Subject: Trivial fixes --- src/main.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 630c38d7..ec9b2bea 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -75,4 +75,3 @@ int main(int argc, char **argv) Application app; return app.exec(); } - -- cgit v1.2.1 From 7557af13f9f904cb9a6240d2101fb14e1ffdca99 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:33:28 +0200 Subject: Fixing Copyrights --- src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ec9b2bea..e9d72fd1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,8 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2008 by Andrea Diamantini +* Copyright (C) 2008-2009 by Andrea Diamantini +* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details * * * This program is free software; you can redistribute it -- cgit v1.2.1 From 184838c57ad9cb6a797535a7a8cde4aa216f9455 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:34:45 +0200 Subject: rekonq 0.1alpha --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index e9d72fd1..a15cbcba 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,7 +30,7 @@ static const char description[] = I18N_NOOP("KDE Browser Webkit Based"); -static const char version[] = "0.0.5"; +static const char version[] = "0.1alpha"; int main(int argc, char **argv) -- cgit v1.2.1 From 782a358735a23bc3ce1be2fd1b788af7f0c6719c Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 01:40:38 +0200 Subject: Fixing authors. Just me for now, waiting for the others.. --- src/main.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index a15cbcba..d0458f1a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,16 +41,17 @@ int main(int argc, char **argv) version, ki18n(description), KAboutData::License_GPL_V3, - ki18n("(C) 2008 Andrea Diamantini"), + ki18n("(C) 2009 rekonq team"), KLocalizedString(), "http://rekonq.sourceforge.net", - "adjam7@gmail.com" + "rekonq@kde.org" ); - about.addAuthor(ki18n("Andrea Diamantini"), - KLocalizedString(), - "adjam7@gmail.com" - ); + // about authors + about.addAuthor(ki18n("Andrea Diamantini"), + ki18n("Project Lead, Developer, Italian translations"), + "adjam7@gmail.com", + "http://www.adjam.org"); // Initialize command line args KCmdLineArgs::init(argc, argv, &about); -- cgit v1.2.1 From 38c308b98481436fd26631d0bb344d1f66ba25fd Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 22 Apr 2009 02:09:44 +0200 Subject: Providing addAuthor example.. --- src/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d0458f1a..d465d50f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,6 +53,11 @@ int main(int argc, char **argv) "adjam7@gmail.com", "http://www.adjam.org"); +// about.addAuthor(ki18n("your name"), +// ki18n("your role"), +// "your mail", +// "your site"); + // Initialize command line args KCmdLineArgs::init(argc, argv, &about); -- cgit v1.2.1 From e657ef44ef1eef1f998101ab3dcce1a251d729fc Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 26 Apr 2009 01:45:38 +0200 Subject: Fixed copyright strings, per file, as decided --- src/main.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d465d50f..d5e7c33b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,6 @@ * This file is a part of the rekonq project * * Copyright (C) 2008-2009 by Andrea Diamantini -* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details * * * This program is free software; you can redistribute it -- cgit v1.2.1 From fdbd70a77a8c294e0a578073c738f3bc4dfa6ab5 Mon Sep 17 00:00:00 2001 From: Alexandr Domrachev Date: Mon, 27 Apr 2009 17:05:43 +0000 Subject: Some changes ported for merge to mainline (bookmarks & links handling related) Added author: me :) Bookmark owner: openFolderinTabs implemented Links handling ported from Pawel branch Issue #1 fixed --- src/main.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d5e7c33b..ea7ab8a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,14 +47,18 @@ int main(int argc, char **argv) ); // about authors - about.addAuthor(ki18n("Andrea Diamantini"), - ki18n("Project Lead, Developer, Italian translations"), - "adjam7@gmail.com", + about.addAuthor(ki18n("Andrea Diamantini"), + ki18n("Project Lead, Developer, Italian translations"), + "adjam7@gmail.com", "http://www.adjam.org"); - -// about.addAuthor(ki18n("your name"), -// ki18n("your role"), -// "your mail", + about.addAuthor(ki18n("Domrachev Alexandr"), + ki18n("Developer, Russian translations"), + "alexandr.domrachev@gmail.com", + ""); + +// about.addAuthor(ki18n("your name"), +// ki18n("your role"), +// "your mail", // "your site"); // Initialize command line args -- cgit v1.2.1 From 32da13f039241349c894f5c13cc1954c16c2e783 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 28 Apr 2009 03:19:14 +0200 Subject: Revert "Some changes ported for merge to mainline (bookmarks & links handling related)" links hadling problem This reverts commit fdbd70a77a8c294e0a578073c738f3bc4dfa6ab5. --- src/main.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index ea7ab8a4..d5e7c33b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,18 +47,14 @@ int main(int argc, char **argv) ); // about authors - about.addAuthor(ki18n("Andrea Diamantini"), - ki18n("Project Lead, Developer, Italian translations"), - "adjam7@gmail.com", + about.addAuthor(ki18n("Andrea Diamantini"), + ki18n("Project Lead, Developer, Italian translations"), + "adjam7@gmail.com", "http://www.adjam.org"); - about.addAuthor(ki18n("Domrachev Alexandr"), - ki18n("Developer, Russian translations"), - "alexandr.domrachev@gmail.com", - ""); - -// about.addAuthor(ki18n("your name"), -// ki18n("your role"), -// "your mail", + +// about.addAuthor(ki18n("your name"), +// ki18n("your role"), +// "your mail", // "your site"); // Initialize command line args -- cgit v1.2.1 From f7d0c1e847801b2ba303e6a0b60545779948fbbf Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 28 Apr 2009 03:40:54 +0200 Subject: Importing some reverted changes --- src/main.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index d5e7c33b..80d94627 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -52,6 +52,11 @@ int main(int argc, char **argv) "adjam7@gmail.com", "http://www.adjam.org"); + about.addAuthor(ki18n("Domrachev Alexandr"), + ki18n("Developer, Russian translations"), + "alexandr.domrachev@gmail.com", + ""); + // about.addAuthor(ki18n("your name"), // ki18n("your role"), // "your mail", -- cgit v1.2.1 From 82862fbd150afae0101757d1d6081e0e6ddf7baa Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 29 Apr 2009 11:24:11 +0200 Subject: astyle --- src/main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 80d94627..c6ffdb46 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,9 +47,9 @@ int main(int argc, char **argv) ); // about authors - about.addAuthor(ki18n("Andrea Diamantini"), - ki18n("Project Lead, Developer, Italian translations"), - "adjam7@gmail.com", + about.addAuthor(ki18n("Andrea Diamantini"), + ki18n("Project Lead, Developer, Italian translations"), + "adjam7@gmail.com", "http://www.adjam.org"); about.addAuthor(ki18n("Domrachev Alexandr"), @@ -57,9 +57,9 @@ int main(int argc, char **argv) "alexandr.domrachev@gmail.com", ""); -// about.addAuthor(ki18n("your name"), -// ki18n("your role"), -// "your mail", +// about.addAuthor(ki18n("your name"), +// ki18n("your role"), +// "your mail", // "your site"); // Initialize command line args -- cgit v1.2.1 From bc1f04c45802fe486e72b30001d026c51f206c8d Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 29 Apr 2009 11:34:40 +0200 Subject: Updating AUTHORS. For me, this is 0.1alpha release candidate. We'll find time until 0.1 release to improve translations, bugfixing && importing unit tests. --- src/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index c6ffdb46..670981e6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -57,6 +57,16 @@ int main(int argc, char **argv) "alexandr.domrachev@gmail.com", ""); + about.addAuthor(ki18n("Pawel Prazak"), + ki18n("Developer"), + "kojots350@gmail.com", + ""); + + about.addAuthor(ki18n("Panagiotis Papadopoulos"), + ki18n("German translations"), + "pano_90@gmx.net", + ""); + // about.addAuthor(ki18n("your name"), // ki18n("your role"), // "your mail", -- cgit v1.2.1 From 91774189a83ceb70f52ed12c39d319fb16e60c09 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 2 May 2009 01:01:28 +0200 Subject: Reverted copyright string, as suggested by KDE people --- src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 670981e6..8b99e8b5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char **argv) version, ki18n(description), KAboutData::License_GPL_V3, - ki18n("(C) 2009 rekonq team"), + ki18n("(C) 2008-2009 Andrea Diamantini"), KLocalizedString(), "http://rekonq.sourceforge.net", "rekonq@kde.org" -- cgit v1.2.1 From f4f66bed53fd53f30f33e57d7f6de30a0ef0791a Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 2 May 2009 02:50:42 +0200 Subject: AUTHORS << pano --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 8b99e8b5..5ada94b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -48,12 +48,12 @@ int main(int argc, char **argv) // about authors about.addAuthor(ki18n("Andrea Diamantini"), - ki18n("Project Lead, Developer, Italian translations"), + ki18n("Project Lead, Developer, Italian translation"), "adjam7@gmail.com", "http://www.adjam.org"); about.addAuthor(ki18n("Domrachev Alexandr"), - ki18n("Developer, Russian translations"), + ki18n("Developer, Russian translation"), "alexandr.domrachev@gmail.com", ""); @@ -63,7 +63,7 @@ int main(int argc, char **argv) ""); about.addAuthor(ki18n("Panagiotis Papadopoulos"), - ki18n("German translations"), + ki18n("German translation"), "pano_90@gmx.net", ""); -- cgit v1.2.1 From 862ff27a5f713e320e56b579b5be72116b018daf Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 6 May 2009 02:12:58 +0200 Subject: updating authors.. --- src/main.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 5ada94b4..4dcdd902 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -67,10 +67,20 @@ int main(int argc, char **argv) "pano_90@gmx.net", ""); -// about.addAuthor(ki18n("your name"), -// ki18n("your role"), -// "your mail", -// "your site"); + about.addAuthor(ki18n("Juan Pablo Scaletti"), + ki18n("Spanish translation"), + "juanpablo@jpscaletti.com", + ""); + + about.addAuthor(ki18n("Eelko Berkenpies"), + ki18n("Dutch translation"), + "kaboon@gmail.com", + ""); + + about.addAuthor(ki18n("Alain Laporte"), + ki18n("French translation"), + "alain_laporte123@yahoo.fr", + ""); // Initialize command line args KCmdLineArgs::init(argc, argv, &about); -- cgit v1.2.1