diff --git a/.gitignore b/.gitignore index a9632e0e..2c0d7db7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -arora -Arora.app -arora.exe +endorphin +Endorphin.app +endorphin.exe Makefile* .DS_Store .ui diff --git a/AUTHORS b/AUTHORS index 983947e7..54c4e44b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,3 @@ -Benjamin C Meyer ben@meyerhome.net Jakub Wieczorek faw217@gmail.com Diego Iastrubni elcuco@kde.org Jakub Lužný limoto94@gmail.com diff --git a/BUILDING.md b/BUILDING.md index 2b7e72af..80aeafb4 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,6 +1,6 @@ -# Step-by-Step Instructions to Run the latest Arora +# Step-by-Step Instructions to Run the latest Endorphin -Arora is still in development, which means that there are no compiled installable packages yet. To try the latest code, follow this guide. +Endorphin is still in development, which means that there are no compiled installable packages yet. To try the latest code, follow this guide. ### Step 1: Make sure git is installed. To see if git is installed, open up a terminal window and type `git`. If it is not installed, the terminal will report back command not found. If it is installed, you'll receive the git help text. To install git: [Windows](https://gitforwindows.org/), [Mac](https://git-scm.com/download/mac), and for Linux, use your distro's package manager. @@ -8,23 +8,23 @@ To see if git is installed, open up a terminal window and type `git`. If it is n ### Step 2: Download and install Qt 5.14 or greater. If you already have **Qt 5.14** or greater installed, you can skip this step. To install Qt 5.14, visit the [Download Page](https://www.qt.io/download) or use your distro's package manager on Linux. Be sure to add the correct PATH variable if required in the official install instructions. When you're done, skip the alternative method section, and move onto Step 3. -### Step 3: Download and compile the latest Arora. -Now we will download the latest tree of Arora. Issue these commands: +### Step 3: Download and compile the latest Endorphin. +Now we will download the latest tree of Endorphin. Issue these commands: ``` -$ git clone git://github.com/AaronDewes/arora.git -$ cd arora +$ git clone git://github.com/AaronDewes/endorphin-browser.git +$ cd endorphin-browser $ mkdir build && cd build $ cmake .. $ make -j$(nproc) ``` -Arora is now compiled. To run arora, simply run `./arora` from the current directory. +Endorphin is now compiled. To run endorphin, simply run `./endorphin` from the current directory. -_**Optional**_: To update to the latest Arora in the future, you can issue these commands: +_**Optional**_: To update to the latest Endorphin in the future, you can issue these commands: ``` -$ cd arora +$ cd endorphin-browser $ git pull $ cd build $ make -j$(nproc) ``` -If you are looking for an IDE to develop Arora in you can checkout the free IDE Qt Creator that is available with Qt. +If you are looking for an IDE to develop Endorphin in you can checkout the free IDE Qt Creator that is available with Qt. diff --git a/CMakeLists.txt b/CMakeLists.txt index d626c9a4..2f1c34a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(Arora) +project(Endorphin) cmake_minimum_required(VERSION 3.16) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff --git a/ChangeLog b/ChangeLog index 8cad2970..b48bb743 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,13 @@ UNRELEASED: Fixed issues: - arora-placesimport sometimes resulted in an "Invalid cross-device link" error. + endorphin-placesimport sometimes resulted in an "Invalid cross-device link" error. Behind the scene: Add alternative CMake build system This is not final yet, and currently only works on Linux. When it is finished, it will replace qmake. - CMake currently reduces the size of arora-placesimport from about 2 MB to about 250 KB. + CMake currently reduces the size of endorphin-placesimport from about 2 MB to about 250 KB. This improvement will be added to QMake later. Other: @@ -77,7 +77,7 @@ Build system: Add an application icon for os2. For finding the locale tools on os2 behave like win32 When building in debug mode on OS2 just like with Windows enable the console. - Move Arora's hooks to the git-hooks format to utilize git-hooks (See: http://github.com/icefox/git-hooks) + Move Endorphin's hooks to the git-hooks format to utilize git-hooks (See: http://github.com/icefox/git-hooks) Default to lrelease and not lrelease-qt4 on non unix platforms. QMAKE_EXTRA_UNIX_TARGETS is deprecated; use QMAKE_EXTRA_TARGETS instead. Enable the raster graphics system by default for X11 @@ -92,7 +92,7 @@ Translation: 0.10.2 The major issues: - - When compiling with Qt 4.6 Arora had been using some API that changes + - When compiling with Qt 4.6 Endorphin had been using some API that changes shortly before the release of Qt 4.6.0 after an API review was done for the new API in QtWebKit. This release changes the code to build with the final API that is found in Qt 4.6.0 @@ -102,7 +102,7 @@ The major issues: 0.10.1 The major issues: Issue: 666 Sites were showing a "SSL handshake failure". With the new NetworkAccessManagerProxy the signals were being sent to the proxy and not the primary networkaccessmanager. - Issue: 683: Arora crashes when using privacy mode. + Issue: 683: Endorphin crashes when using privacy mode. When switching to private mode the primary networkaccessmanagers swaps cookiejar's which caused a segfault. Introduce a CookieJarProxy class which will pass the cookie requests to the primary networkaccessmanager's cookiejar. Translations: @@ -140,16 +140,16 @@ Interface - Issue #650: Save the toolbar location allowing the toolbars to be next to each other - Add ctrl-z shortcut to undo the closing of the last tab. - Behave better when access keys are enabled by adding a slight delay to make sure that the ctrl is actually for access keys and not for another shortcut such as ctrl-tab or ctrl-a -- When arora crashed on the previous startup give the user a way to bypass the failsafe and restore their session if they really want. +- When endorphin crashed on the previous startup give the user a way to bypass the failsafe and restore their session if they really want. - Add the ability to set the length of a session cookie - Enable DNS prefetching and WebKit version in the about dialog when building against Qt 4.6. - Remember what tab you were on when you close the settings dialog - Add a browse button next to the style sheet line edit to help users find files and automatically translate them into url's. - Add icons to the menu actions on freedesktop systems. - Show the configure search engines action in the tools menu -- Change default bookmarks to only have a link to htpp://arora-browser.org +- Change default bookmarks to only have a link to htpp://endorphin-browser.org Removed all of Qt development type entries - From discussion on http://arorabrowser.blogspot.com/2009/08/arora-090.html and also the Kubuntu guys strip the bookmarks in their release so it make sense. + From discussion on http://endorphinbrowser.blogspot.com/2009/08/endorphin-090.html and also the Kubuntu guys strip the bookmarks in their release so it make sense. - Move the Preferences menu item to Tools|Options - Set placeholder text for the start page search box - Add a checkbox to hide/show hidden files in the directory listing. @@ -163,7 +163,7 @@ Behind the scenes - Rename lineedit -> locationbar functions & variables - Enhance SingleApplication so that the host can send messages back to the second application. On Windows this is used to send the window id back to the application that was just started - so it can raise the arora window to the front. + so it can raise the endorphin window to the front. - Fix some old MSVC compile warnings - Make it possible to retranslate the bookmarks toolbar title - Set the maximumPagesInCache to 3 (default is 0) and provide a way for users to set this value through QSettings. @@ -295,7 +295,7 @@ Behind the scenes - OpenSearch: localization improvements. Build system -- Include an additional XML file in the installation, which will make Arora appear in Gnome Control Center on the list of available web browsers that can be set as default. +- Include an additional XML file in the installation, which will make Endorphin appear in Gnome Control Center on the list of available web browsers that can be set as default. - Add man pages for the tools. - webkit.pri now supports building QtWebKit as a framework on mac. @@ -317,7 +317,7 @@ Interface - Add a setting specifying if the application should quit when last tab is closed. - Revert the check for the Oxygen style so when under KDE4 Oxygen will be used even if it has issues. -- Fix mid click to paste urls into Arora to have them be loaded +- Fix mid click to paste urls into Endorphin to have them be loaded - Fix crash in Clear Privacy Dialog when cache is disabled - In the download manager change the "Ok" Button to "Close" - Fix the positioning of new tab and close tab buttons. Comparing to 0.6 they are just swapped now. @@ -348,7 +348,7 @@ used even if it has issues. Behind the scenes - Add a subclass of QWebPluginFactory that can be used for managing QWebPlugin's - Add a static BrowserMainWindow::parentWindow(QWidget *) method that returns a main window being one of the passed widget's parents. -- Move QTRY functions into their own header file as it has no dependency on Arora and can be used by tests that don't require BrowserApplication +- Move QTRY functions into their own header file as it has no dependency on Endorphin and can be used by tests that don't require BrowserApplication - Mark strings as not translatable where it doesn't make sense - Move location bar site icon class into its own file - Move the privacy indicator out into its own class and file @@ -372,17 +372,17 @@ Build system - When building by default don't have lrelase be verbose as it du/mps a lot of junk on the console - Add commit hook to do basic style checking on the files being commited - unset GIT_DIR to fix warnings that are printed to the console -- When building Arora also don't allow casts to ascii to detect bugs. -- Share compiled object files with the main arora binary to reduce build times +- When building Endorphin also don't allow casts to ascii to detect bugs. +- Share compiled object files with the main endorphin binary to reduce build times 0.6.1 -When using Arora with Qt 4.5.1 after a little while pages will stop rendering. +When using Endorphin with Qt 4.5.1 after a little while pages will stop rendering. This is because of a bug in 4.5.1 where renaming a file will cause the file descriptor to not be closed. QNetworkDiskCache is a simple cache and uses QTemporaryFile's for each new cached file and eventually the kernel wont let QNetworkDiskCache open a cache file because all of the previous files were not -closed. When running against Qt 4.5.1 Arora will now disable the disk cache. +closed. When running against Qt 4.5.1 Endorphin will now disable the disk cache. 0.6 @@ -406,7 +406,7 @@ Interface - Allow to close the browser with more than one window opened, which was previously impossible (it might be useful when you restore session on startup). - Revert to the default tab selection behavior after closing a tab to match other browsers - Middle button role should be inverted when "Select tabs and windows as they created" is selected -- Add support for MidClick/Ctrl-Click/Shift-Ctrl-Click to all urls in Arora. Be it in menus, toolbars, links and javascript links. +- Add support for MidClick/Ctrl-Click/Shift-Ctrl-Click to all urls in Endorphin. Be it in menus, toolbars, links and javascript links. - Add support for XButton1 and XButton2 to be back/forward on the webview - Add the ability to turn pop-up blocking off - More control to the users! Added a possibility to control where target="_blank" links will be opened and default to a new tab. @@ -434,12 +434,12 @@ Behind the scenes - Re-code searchlineedit to just be a LineEdit subclass that has a search button and a clear button and nothing more. - Re-code the SearchButton to use the QCompleter, take up less width when there isn't one and use a QImage. - Update the toolbar search widget to use the completer rather then the old QMenu -- Significantly improve the startup time of Arora. +- Significantly improve the startup time of Endorphin. - Add new access functions to the DownloadItem data. - Move the ClearButton and SearchButton class into its own file - Fix searchbar for special chars such as '+'. This seems a bug in Qt's addQueryItem. Workaround is to use addEncodedQueryItem. - delete the root bookmark node on exit to not generate errors in valgrind -- fix memory leaks in the autotest to confirm that Arora's xbel doesn't have any leaks +- fix memory leaks in the autotest to confirm that Endorphin's xbel doesn't have any leaks - Only clear the cookies if we have loaded them - In ModelMenu rather then all submenu's being QMenu let them be specified by the implementation and as the default use ModelMenu. - Add new menumodel manualtest @@ -503,7 +503,7 @@ Behind the scenes - The error web pages are now translatable. - Encode urls rather then use toString in various places to prevent loss of url data. - When using foreach try to use a const reference so a copy isn't made (slower) compared to the reference (faster). -- Add a new tool to convert bookmarks that are in the html format into the XBel format (not used in Arora yet). +- Add a new tool to convert bookmarks that are in the html format into the XBel format (not used in Endorphin yet). - Various code style and general keeping the code clean fixes - Add Implementation to get the current username on Windows for the single application @@ -519,7 +519,7 @@ Interface - Make middle click on bookmarks menus open the user in a new tab. - Added the ability to change the language from the Help menu. - Double left click location bar selects all of the text. -- Incorporate Jens Explorer style into Arora on Window for a better look and feel on XP and Vista. http://labs.trolltech.com/blogs/2007/06/08/explorer-style-toolbars/ +- Incorporate Jens Explorer style into Endorphin on Window for a better look and feel on XP and Vista. http://labs.trolltech.com/blogs/2007/06/08/explorer-style-toolbars/ - Change the "icon" on the next/prev search for RTL desktops: next points to the right, and previous points to the right - Various RightToLeft fixes for for Mozilla's bug https://bugzilla.mozilla.org/show_bug.cgi?id=219070 - When the url scheme is https make the location bar background turn yellow. @@ -567,15 +567,15 @@ Build system - Tweak action accelerators (the same ones were being used) Build system -- Allow building Arora with both Debug/Release of WebKit trunk +- Allow building Endorphin with both Debug/Release of WebKit trunk - Only include the sha1 and change number in the version when using git. -- Create utils directory to contain non-Arora specific classes +- Create utils directory to contain non-Endorphin specific classes - Run desktop file through desktop-file-validate and correct the errors Autotests - Add QTRY_COMPARE and QTRY_VERIFY for the autotests to use. -- add AUTOTESTS define when running autotests to prevent accessing running arora's and sending url's to it -- Fix autotest failures (test related, not arora) +- add AUTOTESTS define when running autotests to prevent accessing running endorphin's and sending url's to it +- Fix autotest failures (test related, not endorphin) - Detect which version of qmake to use when building the autotests - Give a 1 second punishment if there is no autotest for the source file that was changed - Emit a warning of a file doesn't have a matching autotest @@ -590,6 +590,6 @@ Autotests - New reset dialog - New about dialog - Add search banner - - Rename to Arora and a new application icon + - Rename to Endorphin and a new application icon - Project specific git hooks - Branch from the Qt demo browser with new autotests and manualtests diff --git a/Doxyfile b/Doxyfile index c3bf8a8a..dd014296 100644 --- a/Doxyfile +++ b/Doxyfile @@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = Arora +PROJECT_NAME = Endorphin # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/README.md b/README.md index 4777392c..88a4f7d2 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ -# Arora web browser +# Endorphin web browser -Arora is a cross platform web browser built using Qt and WebKit. +Endorphin is a cross platform web browser built using Qt and WebKit. -This is a fork of the [original Arora browser](https://github.com/Arora/arora). -The original browser was created by Benjamin C. Meyer. -This fork was created and is maintained by Aaron Dewes. +This is a fork of the [Arora browser](https://github.com/Arora/arora). +This fork was created by Aaron Dewes. ## Contributing @@ -12,5 +11,5 @@ If you want to contribute, feel free to open an issue or a PR. ### Building -Arora uses the cmake build system. If you already have Qt 5.14 or newer on your system building is as easy as running the command 'cmake' and then 'make'. +Endorphin uses the cmake build system. If you already have Qt 5.14 or newer on your system building is as easy as running the command 'cmake' and then 'make'. For more detailed information see the [Building guide](BUILDING.md). diff --git a/autotests/adblock/adblockmanager/tst_adblockmanager.cpp b/autotests/adblock/adblockmanager/tst_adblockmanager.cpp index 12926d86..658b9f6f 100644 --- a/autotests/adblock/adblockmanager/tst_adblockmanager.cpp +++ b/autotests/adblock/adblockmanager/tst_adblockmanager.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp b/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp index 90b2ea6e..9ade541f 100644 --- a/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp +++ b/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/adblock/adblockpage/tst_adblockpage.cpp b/autotests/adblock/adblockpage/tst_adblockpage.cpp index ee8d16ac..a8071830 100644 --- a/autotests/adblock/adblockpage/tst_adblockpage.cpp +++ b/autotests/adblock/adblockpage/tst_adblockpage.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/adblock/adblockrule/tst_adblockrule.cpp b/autotests/adblock/adblockrule/tst_adblockrule.cpp index 1ba1a046..25896c2a 100644 --- a/autotests/adblock/adblockrule/tst_adblockrule.cpp +++ b/autotests/adblock/adblockrule/tst_adblockrule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * Copyright 2009 Zsombor Gegesy * * This program is free software; you can redistribute it and/or modify diff --git a/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp b/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp index 81decc53..475ee467 100644 --- a/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp +++ b/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp b/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp index 4e4a9775..0f2e6d49 100644 --- a/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp +++ b/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/autosaver/tst_autosaver.cpp b/autotests/autosaver/tst_autosaver.cpp index bec2f8c2..5e942746 100644 --- a/autotests/autosaver/tst_autosaver.cpp +++ b/autotests/autosaver/tst_autosaver.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/autotests.pri b/autotests/autotests.pri index 1befa6f5..f72584ad 100644 --- a/autotests/autotests.pri +++ b/autotests/autotests.pri @@ -6,7 +6,7 @@ CONFIG += qtestlib include($$PWD/../src/src.pri) include($$PWD/modeltest/modeltest.pri) -HEADERS += qtest_arora.h +HEADERS += qtest_endorphin.h DEFINES += AUTOTESTS diff --git a/autotests/bookmarknode/tst_bookmarknode.cpp b/autotests/bookmarknode/tst_bookmarknode.cpp index a8307e7c..15cdda19 100644 --- a/autotests/bookmarknode/tst_bookmarknode.cpp +++ b/autotests/bookmarknode/tst_bookmarknode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Benjamin C. Meyer + * Copyright (c) 2014 Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/cookiejar/tst_cookiejar.cpp b/autotests/cookiejar/tst_cookiejar.cpp index ba912ba1..e7a99a67 100644 --- a/autotests/cookiejar/tst_cookiejar.cpp +++ b/autotests/cookiejar/tst_cookiejar.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/autotests/downloadmanager/tst_downloadmanager.cpp b/autotests/downloadmanager/tst_downloadmanager.cpp index 0d4eb956..6e142f6c 100644 --- a/autotests/downloadmanager/tst_downloadmanager.cpp +++ b/autotests/downloadmanager/tst_downloadmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/historyfiltermodel/tst_historyfiltermodel.cpp b/autotests/historyfiltermodel/tst_historyfiltermodel.cpp index c430ef73..b753239f 100644 --- a/autotests/historyfiltermodel/tst_historyfiltermodel.cpp +++ b/autotests/historyfiltermodel/tst_historyfiltermodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/historymanager/tst_historymanager.cpp b/autotests/historymanager/tst_historymanager.cpp index c1173f9d..48d06671 100644 --- a/autotests/historymanager/tst_historymanager.cpp +++ b/autotests/historymanager/tst_historymanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2014 Benjamin C. Meyer + * Copyright 2008-2014 Aaron Dewes * * 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 @@ -18,7 +18,7 @@ */ #include -#include "qtest_arora.h" +#include "qtest_endorphin.h" #include #include diff --git a/autotests/opensearchengine/tst_opensearchengine.cpp b/autotests/opensearchengine/tst_opensearchengine.cpp index fcb91fc2..3a3bd205 100644 --- a/autotests/opensearchengine/tst_opensearchengine.cpp +++ b/autotests/opensearchengine/tst_opensearchengine.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * Copyright 2009 Jakub Wieczorek * * This program is free software; you can redistribute it and/or modify diff --git a/autotests/opensearchmanager/tst_opensearchmanager.cpp b/autotests/opensearchmanager/tst_opensearchmanager.cpp index bf56cc63..6f060533 100644 --- a/autotests/opensearchmanager/tst_opensearchmanager.cpp +++ b/autotests/opensearchmanager/tst_opensearchmanager.cpp @@ -19,7 +19,7 @@ #include -#include "qtest_arora.h" +#include "qtest_endorphin.h" #include "opensearchengine.h" #include "opensearchmanager.h" diff --git a/autotests/opensearchwriter/testfile2.xml b/autotests/opensearchwriter/testfile2.xml index 9141cec1..4b9e3987 100644 --- a/autotests/opensearchwriter/testfile2.xml +++ b/autotests/opensearchwriter/testfile2.xml @@ -1,6 +1,6 @@ - Arora! + Endorphin! a cross platform web browser built using Qt and WebKit diff --git a/autotests/opensearchwriter/tst_opensearchwriter.cpp b/autotests/opensearchwriter/tst_opensearchwriter.cpp index 26fc53be..4aba40fb 100644 --- a/autotests/opensearchwriter/tst_opensearchwriter.cpp +++ b/autotests/opensearchwriter/tst_opensearchwriter.cpp @@ -77,7 +77,7 @@ void tst_OpenSearchWriter::write_data() << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString() << QString("get") << QString(":/testfile1.xml"); - QTest::newRow("testfile2") << QString("Arora!") << QString("a cross platform web browser built using Qt and WebKit") + QTest::newRow("testfile2") << QString("Endorphin!") << QString("a cross platform web browser built using Qt and WebKit") << QString("http://foobar.barfoo/search") << QString("http://foobar.barfoo/suggest") << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString("get") << QString("post") << QString(":/testfile2.xml"); diff --git a/autotests/qtest_arora.h b/autotests/qtest_endorphin.h similarity index 91% rename from autotests/qtest_arora.h rename to autotests/qtest_endorphin.h index 2233c7c4..fa6bd9db 100644 --- a/autotests/qtest_arora.h +++ b/autotests/qtest_endorphin.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -17,8 +17,8 @@ * Boston, MA 02110-1301 USA */ -#ifndef QTEST_ARORA_H -#define QTEST_ARORA_H +#ifndef QTEST_ENDORPHIN_H +#define QTEST_ENDORPHIN_H #include diff --git a/autotests/qtry.h b/autotests/qtry.h index fa3539ba..db402728 100644 --- a/autotests/qtry.h +++ b/autotests/qtry.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2008 - 2009, Benjamin C. Meyer + * Copyright (c) 2008 - 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/searchlineedit/tst_searchlineedit.cpp b/autotests/searchlineedit/tst_searchlineedit.cpp index 223b19c6..245249e1 100644 --- a/autotests/searchlineedit/tst_searchlineedit.cpp +++ b/autotests/searchlineedit/tst_searchlineedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/autotests/tabbar/tst_tabbar.cpp b/autotests/tabbar/tst_tabbar.cpp index 3e76bbb8..aa173062 100644 --- a/autotests/tabbar/tst_tabbar.cpp +++ b/autotests/tabbar/tst_tabbar.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/tabwidget/tst_tabwidget.cpp b/autotests/tabwidget/tst_tabwidget.cpp index a4fb48e1..a59ee908 100644 --- a/autotests/tabwidget/tst_tabwidget.cpp +++ b/autotests/tabwidget/tst_tabwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -21,7 +21,7 @@ #include #include #include -#include "qtest_arora.h" +#include "qtest_endorphin.h" #include #include diff --git a/autotests/utils/editlistview/tst_editlistview.cpp b/autotests/utils/editlistview/tst_editlistview.cpp index 129d6909..e3a939da 100644 --- a/autotests/utils/editlistview/tst_editlistview.cpp +++ b/autotests/utils/editlistview/tst_editlistview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/autotests/utils/edittreeview/tst_edittreeview.cpp b/autotests/utils/edittreeview/tst_edittreeview.cpp index b15a4593..8bcfce3f 100644 --- a/autotests/utils/edittreeview/tst_edittreeview.cpp +++ b/autotests/utils/edittreeview/tst_edittreeview.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/utils/languagemanager/tst_languagemanager.cpp b/autotests/utils/languagemanager/tst_languagemanager.cpp index 414eb1d4..09d3a8f6 100644 --- a/autotests/utils/languagemanager/tst_languagemanager.cpp +++ b/autotests/utils/languagemanager/tst_languagemanager.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2008, Benjamin C. Meyer + * Copyright (c) 2008, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/autotests/utils/lineedit/tst_lineedit.cpp b/autotests/utils/lineedit/tst_lineedit.cpp index f268550d..f44c71e1 100644 --- a/autotests/utils/lineedit/tst_lineedit.cpp +++ b/autotests/utils/lineedit/tst_lineedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp b/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp index 1a72f699..56c04049 100644 --- a/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp +++ b/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/autotests/utils/webpageproxy/tst_webpageproxy.cpp b/autotests/utils/webpageproxy/tst_webpageproxy.cpp index dd9db5f8..e66d6b83 100644 --- a/autotests/utils/webpageproxy/tst_webpageproxy.cpp +++ b/autotests/utils/webpageproxy/tst_webpageproxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/autotests/webactionmapper/tst_webactionmapper.cpp b/autotests/webactionmapper/tst_webactionmapper.cpp index 742293da..3622a602 100644 --- a/autotests/webactionmapper/tst_webactionmapper.cpp +++ b/autotests/webactionmapper/tst_webactionmapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -26,7 +26,7 @@ #include #include -#include "qtest_arora.h" +#include "qtest_endorphin.h" class tst_WebActionMapper : public QObject { diff --git a/autotests/webpage/tst_webpage.cpp b/autotests/webpage/tst_webpage.cpp index facc2ef9..bf3941e5 100644 --- a/autotests/webpage/tst_webpage.cpp +++ b/autotests/webpage/tst_webpage.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 @@ -24,7 +24,7 @@ #include #include -#include "qtest_arora.h" +#include "qtest_endorphin.h" class tst_WebPage : public QObject { @@ -352,7 +352,7 @@ void tst_WebPage::javaScriptObjects_data() { QTest::addColumn("url"); QTest::addColumn("windowExternal"); - QTest::addColumn("windowArora"); + QTest::addColumn("windowEndorphin"); QTest::newRow("qrc:/notfound.html") << QUrl("qrc:/notfound.html") << true << false; QTest::newRow("qrc:/startpage.html") << QUrl("qrc:/startpage.html") << true << true; @@ -362,7 +362,7 @@ void tst_WebPage::javaScriptObjects() { QFETCH(QUrl, url); QFETCH(bool, windowExternal); - QFETCH(bool, windowArora); + QFETCH(bool, windowEndorphin); SubWebPage page; QSignalSpy spy(&page, SIGNAL(loadFinished(bool))); @@ -370,10 +370,10 @@ void tst_WebPage::javaScriptObjects() QTRY_COMPARE(spy.count(), 1); QVariant windowExternalVariant = page.mainFrame()->evaluateJavaScript(QLatin1String("window.external")); - QVariant windowAroraVariant = page.mainFrame()->evaluateJavaScript(QLatin1String("window.arora")); + QVariant windowEndorphinVariant = page.mainFrame()->evaluateJavaScript(QLatin1String("window.endorphin")); QCOMPARE(windowExternal, !windowExternalVariant.isNull()); - QCOMPARE(windowArora, !windowAroraVariant.isNull()); + QCOMPARE(windowEndorphin, !windowEndorphinVariant.isNull()); } void tst_WebPage::userAgent() diff --git a/autotests/xbel/tst_xbel.cpp b/autotests/xbel/tst_xbel.cpp index 6700f756..d74bda56 100644 --- a/autotests/xbel/tst_xbel.cpp +++ b/autotests/xbel/tst_xbel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/buildosx.sh b/buildosx.sh index 70c191d7..dcb5207f 100755 --- a/buildosx.sh +++ b/buildosx.sh @@ -3,9 +3,9 @@ # This script requires the use of the macdeployqt tool that is found in Qt 4.5 # -APP="Arora" +APP="Endorphin" VERSION="0.12.1" -#BACKGROUND="src/data/512x512/arora.png" +#BACKGROUND="src/data/512x512/endorphin.png" DIR="bundle" if [ -d $DIR.app ] ; then diff --git a/debian/arora.menu b/debian/arora.menu deleted file mode 100644 index f410cd82..00000000 --- a/debian/arora.menu +++ /dev/null @@ -1,3 +0,0 @@ -?package(arora):needs="x11" section="Applications/Network/Web Browsing" \ - title="Arora" longtitle="Arora Web Browser" \ - command="arora" icon="/usr/share/pixmaps/arora.xpm" diff --git a/debian/changelog b/debian/changelog index a25f7e97..34a71eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -arora (0.12.1) buster; urgency=low +endorphin (0.12.1) buster; urgency=low * Initial release diff --git a/debian/control b/debian/control index af7e67a1..3a709bba 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ -Source: arora +Source: endorphin Section: web Priority: extra Maintainer: Aaron Dewes Build-Depends: debhelper (>= 5), qtbase5-dev (>= 5.14), cmake (>= 3.16) Standards-Version: 3.7.3 -Package: arora +Package: endorphin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: www-browser -Description: Arora is an open-source browser project that aims to build a cross-platform +Description: Endorphin is an open-source browser project that aims to build a cross-platform WebKit browser that integrates with every desktop. diff --git a/debian/copyright b/debian/copyright index 1c23c680..d5e2a493 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,23 +1,23 @@ This package was debianized by Sune Vuorela on Sun, 25 May 2008 15:45:28 +0200. -It was downloaded from http://arora-browser.org +It was downloaded from http://endorphin-browser.org Upstream Author: - Benjamin Meyer + Aaron Dewes Copyright: Copyright 1998-1999 Netscape Communications Corporation. All Copyright 2005-2008 Trolltech ASA. All rights reserved. Copyright 2006 Junio C Hamano - Copyright 2007-2009 Benjamin C. Meyer + Copyright 2007-2009 Aaron Dewes Copyright 2008 Ariya Hidayat Copyright 2008-2009 Christian Franke Copyright 2008 Diego Iastrubni, elcuco, at, kde.org Copyright 2008 Jason A. Donenfeld Copyright 2008 Matvey Kozhev - Copyright 2008-2009 Arora Developers + Copyright 2008-2009 Endorphin Developers Copyright 2008-2009 Benjamin K. Stuhl Copyright 2008-2009 Jason A. Donenfeld Copyright 2009 Jakub Wieczorek diff --git a/debian/docs b/debian/docs index e845566c..b43bf86b 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README +README.md diff --git a/debian/endorphin.menu b/debian/endorphin.menu new file mode 100644 index 00000000..adcab1b9 --- /dev/null +++ b/debian/endorphin.menu @@ -0,0 +1,3 @@ +?package(endorphin):needs="x11" section="Applications/Network/Web Browsing" \ + title="Endorphin" longtitle="Endorphin Web Browser" \ + command="endorphin" icon="/usr/share/pixmaps/endorphin.xpm" diff --git a/debian/arora.postinst b/debian/endorphin.postinst similarity index 53% rename from debian/arora.postinst rename to debian/endorphin.postinst index b8268742..a30066dd 100644 --- a/debian/arora.postinst +++ b/debian/endorphin.postinst @@ -2,7 +2,7 @@ set -e update-alternatives --install \ - /usr/bin/x-www-browser x-www-browser /usr/bin/arora 90 \ - --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/arora.1.gz + /usr/bin/x-www-browser x-www-browser /usr/bin/endorphin 90 \ + --slave /usr/share/man/man1/x-www-browser.1.gz x-www-browser.1.gz /usr/share/man/man1/endorphin.1.gz #DEBHELPER# diff --git a/debian/arora.prerm b/debian/endorphin.prerm similarity index 60% rename from debian/arora.prerm rename to debian/endorphin.prerm index e139f5cf..f8a7e996 100644 --- a/debian/arora.prerm +++ b/debian/endorphin.prerm @@ -2,7 +2,7 @@ set -e if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then - update-alternatives --remove x-www-browser /usr/bin/arora + update-alternatives --remove x-www-browser /usr/bin/endorphin fi #DEBHELPER# diff --git a/debian/rules b/debian/rules index 2922e215..745afa34 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ install: build dh_testdir dh_testroot dh_clean -k - cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/arora install + cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/endorphin install binary-indep: build install diff --git a/arora.pro b/endorphin.pro similarity index 87% rename from arora.pro rename to endorphin.pro index 3790debd..65480cf7 100644 --- a/arora.pro +++ b/endorphin.pro @@ -1,5 +1,5 @@ lessThan(QT_VERSION, 5.0) { - error("Arora requires Qt 5.0 or greater") + error("Endorphin requires Qt 5.0 or greater") } TEMPLATE = subdirs diff --git a/generateReleaseContributors b/generateReleaseContributors index 8cb413a9..f1efdb9d 100755 --- a/generateReleaseContributors +++ b/generateReleaseContributors @@ -9,7 +9,7 @@ do # Linux md5=`echo -e "$email\c" | md5sum | sed -e s/\ -//g` echo -n $md5 - echo -n ".jpg?s=40\" width=\"40\" height=\"40\" />"; + echo -n ".jpg?s=40\" width=\"40\" height=\"40\">"; echo " $name $email
" done diff --git a/git_hooks/README.md b/git_hooks/README.md index 35f3a95c..fb0e94a8 100644 --- a/git_hooks/README.md +++ b/git_hooks/README.md @@ -1,6 +1,6 @@ # Git hooks -These are various git hooks that are used to help improve the quality of Arora. +These are various git hooks that are used to help improve the quality of Endorphin. They are managed using the [git-hooks tool](https://github.com/AaronDewes/git-hooks). diff --git a/git_hooks/pre-commit/compile b/git_hooks/pre-commit/compile index f805c463..64e38327 100755 --- a/git_hooks/pre-commit/compile +++ b/git_hooks/pre-commit/compile @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010, Benjamin C. Meyer +# Copyright (c) 2010, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/git_hooks/pre-commit/compile_manualtest b/git_hooks/pre-commit/compile_manualtest index 29ed2f2c..59148163 100755 --- a/git_hooks/pre-commit/compile_manualtest +++ b/git_hooks/pre-commit/compile_manualtest @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010, Benjamin C. Meyer +# Copyright (c) 2010, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/git_hooks/pre-commit/copyrightyear b/git_hooks/pre-commit/copyrightyear index ce5fe21a..4c903106 100755 --- a/git_hooks/pre-commit/copyrightyear +++ b/git_hooks/pre-commit/copyrightyear @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010-2014, Benjamin C. Meyer +# Copyright (c) 2010-2014, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/git_hooks/pre-commit/run_autotest b/git_hooks/pre-commit/run_autotest index d1682f24..0acb4bfc 100755 --- a/git_hooks/pre-commit/run_autotest +++ b/git_hooks/pre-commit/run_autotest @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010, Benjamin C. Meyer +# Copyright (c) 2010, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/git_hooks/pre-commit/stylecheck_astyle b/git_hooks/pre-commit/stylecheck_astyle index 2ba26109..d3b633bd 100755 --- a/git_hooks/pre-commit/stylecheck_astyle +++ b/git_hooks/pre-commit/stylecheck_astyle @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010, Benjamin C. Meyer +# Copyright (c) 2010, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/git_hooks/pre-commit/stylecheck_bash b/git_hooks/pre-commit/stylecheck_bash index fe582f20..92fbfcbb 100755 --- a/git_hooks/pre-commit/stylecheck_bash +++ b/git_hooks/pre-commit/stylecheck_bash @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2010-2014, Benjamin C. Meyer +# Copyright (c) 2010-2014, Aaron Dewes # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/manualtests/adblock/adblockdialog/main_adblockdialog.cpp b/manualtests/adblock/adblockdialog/main_adblockdialog.cpp index ab233169..ede8d54b 100644 --- a/manualtests/adblock/adblockdialog/main_adblockdialog.cpp +++ b/manualtests/adblock/adblockdialog/main_adblockdialog.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/manualtests/adblock/adblockmodel/main_adblockmodel.cpp b/manualtests/adblock/adblockmodel/main_adblockmodel.cpp index f3a50418..6e255a6a 100644 --- a/manualtests/adblock/adblockmodel/main_adblockmodel.cpp +++ b/manualtests/adblock/adblockmodel/main_adblockmodel.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/manualtests/bookmarks/main_bookmarks.cpp b/manualtests/bookmarks/main_bookmarks.cpp index 7628863e..f30c6f00 100644 --- a/manualtests/bookmarks/main_bookmarks.cpp +++ b/manualtests/bookmarks/main_bookmarks.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QCoreApplication::setApplicationName(QLatin1String("arora")); + QCoreApplication::setApplicationName(QLatin1String("endorphin")); QCoreApplication::setApplicationVersion(QLatin1String("0.1")); new ModelTest(BrowserApplication::bookmarksManager()->bookmarksModel()); diff --git a/manualtests/downloadmanager/main_downloadmanager.cpp b/manualtests/downloadmanager/main_downloadmanager.cpp index 14579edc..50c4dc79 100644 --- a/manualtests/downloadmanager/main_downloadmanager.cpp +++ b/manualtests/downloadmanager/main_downloadmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/manualtests/history/main_history.cpp b/manualtests/history/main_history.cpp index 6b8669cc..1c45c4d9 100644 --- a/manualtests/history/main_history.cpp +++ b/manualtests/history/main_history.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -31,7 +31,7 @@ int main(int argc, char **argv) QApplication application(argc, argv); QMainWindow w; - QCoreApplication::setApplicationName("arora"); + QCoreApplication::setApplicationName("endorphin"); HistoryManager history; diff --git a/manualtests/locationbar/main_locationbar.cpp b/manualtests/locationbar/main_locationbar.cpp index 94d2140f..c3b5a07e 100644 --- a/manualtests/locationbar/main_locationbar.cpp +++ b/manualtests/locationbar/main_locationbar.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/manualtests/modelmenu/main_modelmenu.cpp b/manualtests/modelmenu/main_modelmenu.cpp index 4ba3c627..279c342c 100644 --- a/manualtests/modelmenu/main_modelmenu.cpp +++ b/manualtests/modelmenu/main_modelmenu.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/manualtests/searchlineedit/main_searchlineedit.cpp b/manualtests/searchlineedit/main_searchlineedit.cpp index 6d1a693a..53b7c971 100644 --- a/manualtests/searchlineedit/main_searchlineedit.cpp +++ b/manualtests/searchlineedit/main_searchlineedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/manualtests/utils/editview/main_editview.cpp b/manualtests/utils/editview/main_editview.cpp index 7eb4daf5..578f1983 100644 --- a/manualtests/utils/editview/main_editview.cpp +++ b/manualtests/utils/editview/main_editview.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/manualtests/utils/lineedit/dialog.ui b/manualtests/utils/lineedit/dialog.ui index 4f5f0a72..e5501383 100644 --- a/manualtests/utils/lineedit/dialog.ui +++ b/manualtests/utils/lineedit/dialog.ui @@ -28,7 +28,7 @@ - Foo Bar Baz Arora LineEdit Manual Test This is the end + Foo Bar Baz Endorphin LineEdit Manual Test This is the end @@ -45,14 +45,14 @@ - Foo Bar Baz Arora LineEdit Manual Test This is the end + Foo Bar Baz Endorphin LineEdit Manual Test This is the end - Foo Bar Baz Arora LineEdit Manual Test This is the end + Foo Bar Baz Endorphin LineEdit Manual Test This is the end @@ -106,7 +106,7 @@ - Foo Bar Baz Arora LineEdit Manual Test + Foo Bar Baz Endorphin LineEdit Manual Test diff --git a/manualtests/utils/lineedit/main_lineedit.cpp b/manualtests/utils/lineedit/main_lineedit.cpp index b55e64e8..2403cff0 100644 --- a/manualtests/utils/lineedit/main_lineedit.cpp +++ b/manualtests/utils/lineedit/main_lineedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/manualtests/utils/singleapplication/main_singleapplication.cpp b/manualtests/utils/singleapplication/main_singleapplication.cpp index c73ab930..fc9a24ae 100644 --- a/manualtests/utils/singleapplication/main_singleapplication.cpp +++ b/manualtests/utils/singleapplication/main_singleapplication.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2008, Benjamin C. Meyer + * Copyright (c) 2008, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/manualtests/utils/squeezelabel/main_squeezelabel.cpp b/manualtests/utils/squeezelabel/main_squeezelabel.cpp index 97bcc0f6..eb9c07d5 100644 --- a/manualtests/utils/squeezelabel/main_squeezelabel.cpp +++ b/manualtests/utils/squeezelabel/main_squeezelabel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp b/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp index 50ff66d0..46c3ec83 100644 --- a/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp +++ b/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/manualtests/webviewsearch/main_webviewsearch.cpp b/manualtests/webviewsearch/main_webviewsearch.cpp index 2e7daf0d..1c3dfeef 100644 --- a/manualtests/webviewsearch/main_webviewsearch.cpp +++ b/manualtests/webviewsearch/main_webviewsearch.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a090abf5..596521ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ # Some common settings -project(Arora) +project(Endorphin) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) @@ -40,7 +40,7 @@ endif() add_definitions(-DGITVERSION=\"\\\"${GIT_REV}\\\"\") add_definitions(-DGITCHANGENUMBER=${GIT_CHANGENUMBER}) # Add all files -set(Arora_SRCS +set(Endorphin_SRCS aboutdialog.cpp acceptlanguagedialog.cpp autosaver.cpp @@ -111,7 +111,7 @@ set(Arora_SRCS opensearch/opensearchmanager.cpp opensearch/opensearchreader.cpp opensearch/opensearchwriter.cpp - qwebplugins/arorawebplugin.cpp + qwebplugins/endorphinwebplugin.cpp qwebplugins/webpluginfactory.cpp useragent/useragentmenu.cpp utils/editlistview.cpp @@ -126,7 +126,7 @@ set(Arora_SRCS utils/webpageproxy.cpp ) -set(Arora_UIS +set(Endorphin_UIS aboutdialog.ui autofilldialog.ui acceptlanguagedialog.ui @@ -144,18 +144,18 @@ set(Arora_UIS network/cookiejar/cookiesexceptions.ui opensearch/opensearchdialog.ui ) -QT5_WRAP_UI(UIS ${Arora_UIS}) +QT5_WRAP_UI(UIS ${Endorphin_UIS}) -set(Arora_RSCS +set(Endorphin_RSCS data/data.qrc data/graphics/graphics.qrc data/searchengines/searchengines.qrc htmls/htmls.qrc useragent/useragents.qrc ) -QT5_ADD_RESOURCES(RSCS ${Arora_RSCS}) +QT5_ADD_RESOURCES(RSCS ${Endorphin_RSCS}) -set(Arora_MOCS +set(Endorphin_MOCS aboutdialog.h acceptlanguagedialog.h autosaver.h @@ -183,7 +183,7 @@ set(Arora_MOCS webview.h webviewsearch.h ) -QT5_WRAP_CPP(MOCS ${Arora_MOCS}) +QT5_WRAP_CPP(MOCS ${Endorphin_MOCS}) # Translations qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ast.ts) @@ -220,16 +220,16 @@ qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_CN.ts) qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_TW.ts) # Generate executable -add_executable(arora ${Arora_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} ${QM_FILES}) -qt5_use_modules(arora Widgets) -qt5_use_modules(arora Core) -qt5_use_modules(arora Gui) -qt5_use_modules(arora WebKit) -qt5_use_modules(arora Network) -qt5_use_modules(arora WebKitWidgets) -qt5_use_modules(arora PrintSupport) +add_executable(endorphin ${Endorphin_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} ${QM_FILES}) +qt5_use_modules(endorphin Widgets) +qt5_use_modules(endorphin Core) +qt5_use_modules(endorphin Gui) +qt5_use_modules(endorphin WebKit) +qt5_use_modules(endorphin Network) +qt5_use_modules(endorphin WebKitWidgets) +qt5_use_modules(endorphin PrintSupport) if(Qt5UiTools_FOUND) - qt5_use_modules(arora UiTools) + qt5_use_modules(endorphin UiTools) endif() -qt5_use_modules(arora Script) +qt5_use_modules(endorphin Script) diff --git a/src/Info_mac.plist b/src/Info_mac.plist index 5af1addb..a2e3cb82 100644 --- a/src/Info_mac.plist +++ b/src/Info_mac.plist @@ -9,7 +9,7 @@ CFBundleGetInfoString Created by Qt/QMake CFBundleIdentifier - com.Arora.Arora + com.endorphin.Endorphin CFBundleSignature ttxt CFBundleExecutable @@ -38,6 +38,6 @@ NOTE - Arora Browser by the Arora team + Endorphin Browser by the Endorphin team diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp index ff2cc773..036ea72f 100644 --- a/src/aboutdialog.cpp +++ b/src/aboutdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Benjamin C. Meyer + * Copyright 2007-2008 Aaron Dewes * Copyright 2008 Matvey Kozhev * * This program is free software; you can redistribute it and/or modify diff --git a/src/aboutdialog.h b/src/aboutdialog.h index f245be31..d58f9341 100644 --- a/src/aboutdialog.h +++ b/src/aboutdialog.h @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008 Benjamin C. Meyer + * Copyright 2007-2008 Aaron Dewes * * 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 diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui index 3d26edb6..03523702 100644 --- a/src/aboutdialog.ui +++ b/src/aboutdialog.ui @@ -133,17 +133,7 @@ - <html> -<body style=" font-size:9pt;"> -<p> -Copyright © 2007-2010 Benjamin C. Meyer &lt; -<a href="mailto:ben@meyerhome.net">ben@meyerhome.net</a>&gt; -</p> -<p>This is an unofficial fork by Aaron Dewes &lt; -<a href="mailto:ben@meyerhome.net">aaron.dewes@web.de</a>&gt; -</p> -</body> -</html> + <html><head/><body><p><span style=" font-size:9pt;">Copyright © 2020 Aaron Dewes &lt; </span><a href="mailto:aaron.dewes@web.de"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">aaron.dewes@web.de</span></a><span style=" font-size:9pt;">&gt; </span></p></body></html> Qt::AlignCenter diff --git a/src/acceptlanguagedialog.cpp b/src/acceptlanguagedialog.cpp index f43be951..fe7c952b 100644 --- a/src/acceptlanguagedialog.cpp +++ b/src/acceptlanguagedialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/src/acceptlanguagedialog.h b/src/acceptlanguagedialog.h index cf6a1817..00afea26 100644 --- a/src/acceptlanguagedialog.h +++ b/src/acceptlanguagedialog.h @@ -1,5 +1,5 @@ /* - * Copyright 2009 Benjamin C. Meyer + * Copyright 2009 Aaron Dewes * * 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 diff --git a/src/adblock/adblockblockednetworkreply.cpp b/src/adblock/adblockblockednetworkreply.cpp index 22bc323c..510525ff 100644 --- a/src/adblock/adblockblockednetworkreply.cpp +++ b/src/adblock/adblockblockednetworkreply.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockblockednetworkreply.h b/src/adblock/adblockblockednetworkreply.h index 67695846..b9914df7 100644 --- a/src/adblock/adblockblockednetworkreply.h +++ b/src/adblock/adblockblockednetworkreply.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockdialog.cpp b/src/adblock/adblockdialog.cpp index d5c466a9..a9d66857 100644 --- a/src/adblock/adblockdialog.cpp +++ b/src/adblock/adblockdialog.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockdialog.h b/src/adblock/adblockdialog.h index b428d2a0..9f0971f8 100644 --- a/src/adblock/adblockdialog.h +++ b/src/adblock/adblockdialog.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index 8cf39642..f0a0b426 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index af021239..462a9a08 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockmodel.cpp b/src/adblock/adblockmodel.cpp index 61f3970a..6c96ce3b 100644 --- a/src/adblock/adblockmodel.cpp +++ b/src/adblock/adblockmodel.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockmodel.h b/src/adblock/adblockmodel.h index c3959bbc..05dd36d2 100644 --- a/src/adblock/adblockmodel.h +++ b/src/adblock/adblockmodel.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblocknetwork.cpp b/src/adblock/adblocknetwork.cpp index 05deaa36..c0354fd4 100644 --- a/src/adblock/adblocknetwork.cpp +++ b/src/adblock/adblocknetwork.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblocknetwork.h b/src/adblock/adblocknetwork.h index 7616a5ae..6dbbdeab 100644 --- a/src/adblock/adblocknetwork.h +++ b/src/adblock/adblocknetwork.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockpage.cpp b/src/adblock/adblockpage.cpp index b18dee48..4fe3131d 100644 --- a/src/adblock/adblockpage.cpp +++ b/src/adblock/adblockpage.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockpage.h b/src/adblock/adblockpage.h index a1f3b0d2..60244902 100644 --- a/src/adblock/adblockpage.h +++ b/src/adblock/adblockpage.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp index 26ab3c86..b6608e86 100644 --- a/src/adblock/adblockrule.cpp +++ b/src/adblock/adblockrule.cpp @@ -1,6 +1,6 @@ /** * Copyright (c) 2009, Zsombor Gegesy - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h index 98ff4ad9..c877b79a 100644 --- a/src/adblock/adblockrule.h +++ b/src/adblock/adblockrule.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockschemeaccesshandler.cpp b/src/adblock/adblockschemeaccesshandler.cpp index 6acecaf5..fe5166ed 100644 --- a/src/adblock/adblockschemeaccesshandler.cpp +++ b/src/adblock/adblockschemeaccesshandler.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblockschemeaccesshandler.h b/src/adblock/adblockschemeaccesshandler.h index bcec735c..fccee5aa 100644 --- a/src/adblock/adblockschemeaccesshandler.h +++ b/src/adblock/adblockschemeaccesshandler.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp index 798090a9..2fb0a80e 100644 --- a/src/adblock/adblocksubscription.cpp +++ b/src/adblock/adblocksubscription.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/adblock/adblocksubscription.h b/src/adblock/adblocksubscription.h index 8813bbfc..5f600486 100644 --- a/src/adblock/adblocksubscription.h +++ b/src/adblock/adblocksubscription.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/autofilldialog.cpp b/src/autofilldialog.cpp index 09275104..7c8d3427 100644 --- a/src/autofilldialog.cpp +++ b/src/autofilldialog.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/autofilldialog.h b/src/autofilldialog.h index 79a4626f..6e8f70c4 100644 --- a/src/autofilldialog.h +++ b/src/autofilldialog.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/autofillmanager.cpp b/src/autofillmanager.cpp index 2880ad16..851ee20d 100644 --- a/src/autofillmanager.cpp +++ b/src/autofillmanager.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -92,7 +92,7 @@ void AutoFillManager::loadSettings() QString AutoFillManager::autoFillDataFile() { - QString fileName = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Arora"; + QString fileName = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin"; fileName += QLatin1String("/autofill.dat"); return fileName; } diff --git a/src/autofillmanager.h b/src/autofillmanager.h index c6a0c00e..2cecd61a 100644 --- a/src/autofillmanager.h +++ b/src/autofillmanager.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/autosaver.cpp b/src/autosaver.cpp index a7b711d9..de7794ac 100644 --- a/src/autosaver.cpp +++ b/src/autosaver.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/autosaver.h b/src/autosaver.h index 4e3690d6..f39b64cc 100644 --- a/src/autosaver.h +++ b/src/autosaver.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/bookmarks/addbookmarkdialog.cpp b/src/bookmarks/addbookmarkdialog.cpp index 98f34107..bd0f0ac2 100644 --- a/src/bookmarks/addbookmarkdialog.cpp +++ b/src/bookmarks/addbookmarkdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2009 Jakub Wieczorek * * This program is free software; you can redistribute it and/or modify diff --git a/src/bookmarks/addbookmarkdialog.h b/src/bookmarks/addbookmarkdialog.h index d57873f8..d50381c6 100644 --- a/src/bookmarks/addbookmarkdialog.h +++ b/src/bookmarks/addbookmarkdialog.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2009 Jakub Wieczorek * * This program is free software; you can redistribute it and/or modify diff --git a/src/bookmarks/bookmarknode.cpp b/src/bookmarks/bookmarknode.cpp index a05e2394..1d927dfb 100644 --- a/src/bookmarks/bookmarknode.cpp +++ b/src/bookmarks/bookmarknode.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2014 Benjamin C. Meyer + * Copyright 2008-2014 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarknode.h b/src/bookmarks/bookmarknode.h index 69c05d20..ef766546 100644 --- a/src/bookmarks/bookmarknode.h +++ b/src/bookmarks/bookmarknode.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2014 Benjamin C. Meyer + * Copyright 2008-2014 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksdialog.cpp b/src/bookmarks/bookmarksdialog.cpp index 6d26bb61..4c81b121 100644 --- a/src/bookmarks/bookmarksdialog.cpp +++ b/src/bookmarks/bookmarksdialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksdialog.h b/src/bookmarks/bookmarksdialog.h index 78fe83ae..513e6e4f 100644 --- a/src/bookmarks/bookmarksdialog.h +++ b/src/bookmarks/bookmarksdialog.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index c8310410..b270980f 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -123,7 +123,7 @@ void BookmarksManager::load() return; m_loaded = true; - QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Arora"; + QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin"; QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel"); if (!QFile::exists(bookmarkFile)) bookmarkFile = QLatin1String(":defaultbookmarks.xbel"); @@ -184,7 +184,7 @@ void BookmarksManager::save() const return; XbelWriter writer; - QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Arora"; + QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin"; QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel"); // Save root folder titles in English (i.e. not localized) m_menu->title = QLatin1String(BOOKMARKMENU); @@ -299,7 +299,7 @@ void BookmarksManager::importBookmarks() if (process.error() != QProcess::UnknownError) { if (process.error() == QProcess::FailedToStart) { QMessageBox::warning(0, tr("htmlToXBel tool required"), - tr("htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, " + tr("htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, " "is not installed or not available in the search paths.")); } else { QMessageBox::warning(0, tr("Loading Bookmark"), diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h index b89a75e4..63d90021 100644 --- a/src/bookmarks/bookmarksmanager.h +++ b/src/bookmarks/bookmarksmanager.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksmenu.cpp b/src/bookmarks/bookmarksmenu.cpp index 56b8877a..af09382d 100644 --- a/src/bookmarks/bookmarksmenu.cpp +++ b/src/bookmarks/bookmarksmenu.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksmenu.h b/src/bookmarks/bookmarksmenu.h index cdff8721..9513e923 100644 --- a/src/bookmarks/bookmarksmenu.h +++ b/src/bookmarks/bookmarksmenu.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/bookmarks/bookmarksmodel.cpp index 029d6276..df5c9f8e 100644 --- a/src/bookmarks/bookmarksmodel.cpp +++ b/src/bookmarks/bookmarksmodel.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarksmodel.h b/src/bookmarks/bookmarksmodel.h index a374a488..3960524d 100644 --- a/src/bookmarks/bookmarksmodel.h +++ b/src/bookmarks/bookmarksmodel.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp index 42c12cfc..ea7d6964 100644 --- a/src/bookmarks/bookmarkstoolbar.cpp +++ b/src/bookmarks/bookmarkstoolbar.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2009 Jakub Wieczorek * * This program is free software; you can redistribute it and/or modify diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h index 6ace7c0a..b18570ff 100644 --- a/src/bookmarks/bookmarkstoolbar.h +++ b/src/bookmarks/bookmarkstoolbar.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2009 Jakub Wieczorek * * This program is free software; you can redistribute it and/or modify diff --git a/src/bookmarks/xbel/xbelreader.cpp b/src/bookmarks/xbel/xbelreader.cpp index 5639bbf7..5c9818f0 100644 --- a/src/bookmarks/xbel/xbelreader.cpp +++ b/src/bookmarks/xbel/xbelreader.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/xbel/xbelreader.h b/src/bookmarks/xbel/xbelreader.h index 667912aa..43fb31a7 100644 --- a/src/bookmarks/xbel/xbelreader.h +++ b/src/bookmarks/xbel/xbelreader.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/xbel/xbelwriter.cpp b/src/bookmarks/xbel/xbelwriter.cpp index 2c186aa5..c81cee6f 100644 --- a/src/bookmarks/xbel/xbelwriter.cpp +++ b/src/bookmarks/xbel/xbelwriter.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/bookmarks/xbel/xbelwriter.h b/src/bookmarks/xbel/xbelwriter.h index f53bc94f..0d62ac8a 100644 --- a/src/bookmarks/xbel/xbelwriter.h +++ b/src/bookmarks/xbel/xbelwriter.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp index bca59e6a..6f0771f7 100644 --- a/src/browserapplication.cpp +++ b/src/browserapplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 @@ -103,9 +103,9 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) : SingleApplication(argc, argv) , quitting(false) { - QCoreApplication::setOrganizationDomain(QLatin1String("arora-browser.org")); - QCoreApplication::setApplicationName(QLatin1String("Arora")); - QCoreApplication::setApplicationVersion(QLatin1String("0.12.0" + QCoreApplication::setOrganizationDomain(QLatin1String("aarondewes.github.io/endorphin/")); + QCoreApplication::setApplicationName(QLatin1String("Endorphin")); + QCoreApplication::setApplicationVersion(QLatin1String("0.12.1" #ifdef GITVERSION " (Git: " GITCHANGENUMBER " " GITVERSION ")" #endif @@ -120,13 +120,13 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) QString message = parseArgumentUrl(args.last()); sendMessage(message.toUtf8()); } - // If we could connect to another Arora then exit - QString message = QString(QLatin1String("aroramessage://getwinid")); + // If we could connect to another Endorphin then exit + QString message = QString(QLatin1String("endorphin://getwinid")); if (sendMessage(message.toUtf8(), 500)) return; #ifdef BROWSERAPPLICATION_DEBUG - qDebug() << "BrowserApplication::" << __FUNCTION__ << "I am the only arora"; + qDebug() << "BrowserApplication::" << __FUNCTION__ << "I am the only endorphin"; #endif // not sure what else to do... @@ -158,7 +158,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) // setting this in the postLaunch actually takes a lot more time // because the event has to be propagated to everyone. - setWindowIcon(QIcon(QLatin1String(":128x128/arora.png"))); + setWindowIcon(QIcon(QLatin1String(":128x128/endorphin.png"))); #ifndef AUTOTESTS QTimer::singleShot(0, this, SLOT(postLaunch())); @@ -222,7 +222,7 @@ void BrowserApplication::messageReceived(QLocalSocket *socket) return; // Got a normal url - if (!message.startsWith(QLatin1String("arora://"))) { + if (!message.startsWith(QLatin1String("endorphin://"))) { QSettings settings; settings.beginGroup(QLatin1String("tabs")); TabWidget::OpenUrlIn tab = TabWidget::OpenUrlIn(settings.value(QLatin1String("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt()); @@ -235,7 +235,7 @@ void BrowserApplication::messageReceived(QLocalSocket *socket) mainWindow()->tabWidget()->loadString(message, tab); return; } else { - if (message.startsWith(QLatin1String("arora://getwinid"))) { + if (message.startsWith(QLatin1String("endorphin://getwinid"))) { #ifdef Q_OS_WIN QString winid = QString(QLatin1String("%1")).arg((qlonglong)mainWindow()->winId()); #else @@ -249,13 +249,13 @@ void BrowserApplication::messageReceived(QLocalSocket *socket) #ifdef BROWSERAPPLICATION_DEBUG qDebug() << "BrowserApplication::" << __FUNCTION__ << "sending win id" << winid << mainWindow()->winId(); #endif - QString message = QLatin1String("arora://winid/") + winid; + QString message = QLatin1String("endorphin://winid/") + winid; socket->write(message.toUtf8()); socket->waitForBytesWritten(); return; } - if (message.startsWith(QLatin1String("arora://winid"))) { + if (message.startsWith(QLatin1String("endorphin://winid"))) { QString winid = message.mid(21); #ifdef BROWSERAPPLICATION_DEBUG qDebug() << "BrowserApplication::" << __FUNCTION__ << "got win id:" << winid; @@ -473,7 +473,7 @@ bool BrowserApplication::restoreLastSession() settings.beginGroup(QLatin1String("MainWindow")); if (settings.value(QLatin1String("restoring"), false).toBool()) { QMessageBox::StandardButton result = QMessageBox::question(0, tr("Restore failed"), - tr("Arora crashed while trying to restore this session. Should I try again?"), QMessageBox::Yes | QMessageBox::No); + tr("Endorphin crashed while trying to restore this session. Should I try again?"), QMessageBox::Yes | QMessageBox::No); if (result == QMessageBox::No) return false; } @@ -665,7 +665,7 @@ QString BrowserApplication::installedDataDirectory() QString BrowserApplication::dataFilePath(const QString &fileName) { - QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Arora"; + QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin"; if (directory.isEmpty()) directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName(); if (!QFile::exists(directory)) { diff --git a/src/browserapplication.h b/src/browserapplication.h index e345836a..3d1b4827 100644 --- a/src/browserapplication.h +++ b/src/browserapplication.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp index 415d976e..84dd2afc 100644 --- a/src/browsermainwindow.cpp +++ b/src/browsermainwindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2008 Jason A. Donenfeld * Copyright 2008 Ariya Hidayat * @@ -1172,7 +1172,7 @@ void BrowserMainWindow::updateWindowTitle(const QString &title) #if defined(Q_WS_MAC) setWindowTitle(title); #else - setWindowTitle(tr("%1 - Arora", "Page title and Browser name").arg(title)); + setWindowTitle(tr("%1 - Endorphin", "Page title and Browser name").arg(title)); #endif } } diff --git a/src/browsermainwindow.h b/src/browsermainwindow.h index a00870f8..ff924875 100644 --- a/src/browsermainwindow.h +++ b/src/browsermainwindow.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * * 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 diff --git a/src/clearbutton.cpp b/src/clearbutton.cpp index 6eaa8f3a..b4d1c050 100644 --- a/src/clearbutton.cpp +++ b/src/clearbutton.cpp @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/clearbutton.h b/src/clearbutton.h index f018ba45..5df47f52 100644 --- a/src/clearbutton.h +++ b/src/clearbutton.h @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Benjamin C. Meyer + * Copyright (c) 2009, Aaron Dewes * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -9,7 +9,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Benjamin Meyer nor the names of its contributors + * 3. Neither the name of the Aaron Dewes nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/src/data/128x128/arora.png b/src/data/128x128/endorphin.png similarity index 100% rename from src/data/128x128/arora.png rename to src/data/128x128/endorphin.png diff --git a/src/data/16x16/arora.png b/src/data/16x16/endorphin.png similarity index 94% rename from src/data/16x16/arora.png rename to src/data/16x16/endorphin.png index 259c10f5..19759ad4 100644 Binary files a/src/data/16x16/arora.png and b/src/data/16x16/endorphin.png differ diff --git a/src/data/32x32/arora.png b/src/data/32x32/endorphin.png similarity index 100% rename from src/data/32x32/arora.png rename to src/data/32x32/endorphin.png diff --git a/src/data/512x512/arora.png b/src/data/512x512/endorphin.png similarity index 100% rename from src/data/512x512/arora.png rename to src/data/512x512/endorphin.png diff --git a/src/data/data.qrc b/src/data/data.qrc index 8769d1b3..85eff66e 100644 --- a/src/data/data.qrc +++ b/src/data/data.qrc @@ -1,8 +1,8 @@ - 128x128/arora.png + 128x128/endorphin.png 128x128/run.png - arora.svg + endorphin.svg defaultbookmarks.xbel fetchLinks.js parseForms.js diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel index 58699291..56e92d6d 100644 --- a/src/data/defaultbookmarks.xbel +++ b/src/data/defaultbookmarks.xbel @@ -3,8 +3,8 @@ Bookmarks Bar - - Arora + + Endorphin diff --git a/src/data/arora.1 b/src/data/endorphin.1 similarity index 72% rename from src/data/arora.1 rename to src/data/endorphin.1 index 445131c5..0c6c690a 100644 --- a/src/data/arora.1 +++ b/src/data/endorphin.1 @@ -1,14 +1,14 @@ -.TH ARORA "1" "May 2008" +.TH ENDORPHIN "1" "May 2008" .SH NAME -Arora - Lightweight web browser based on Qt and WebKit +Endorphin - Lightweight web browser based on Qt and WebKit .SH SYNOPSIS -.B arora [Qt options] [url] +.B endorphin [Qt options] [url] .SH DESCRIPTION -.B Arora -is a lightweight, cross-platform web browser using the Qt 4.4 port of the WebKit +.B Endorphin +is a lightweight, cross-platform web browser using the Qt 5.x port of the WebKit layout engine. It is based on the demo browser application shipped with Qt demos. @@ -31,16 +31,17 @@ and the maximum number of widgets that existed at the same time. .B -reverse Sets the application's layout direction to right-to-left. -.SS Options Specific to Arora +.SS Options Specific to Endorphin .TP .B url The URL address to open in the browser. .SH BUGS -Please report bugs to \fIhttp://code.google.com/p/arora/issues/list\fR. +Please report bugs to \fIhttps://github.com/AaronDewes/endorphin-browser/issues\fR. .SH AUTHOR -The author of Arora is Benjamin C. Meyer . +The author of Endorphin is Aaron Dewes . +Endorphin is based on Arora by Aaron Dewes . .PP This manual page was written by Matvey Kozhev . .PP diff --git a/src/data/arora.svg b/src/data/endorphin.svg similarity index 99% rename from src/data/arora.svg rename to src/data/endorphin.svg index e4a6260b..23af42cd 100644 --- a/src/data/arora.svg +++ b/src/data/endorphin.svg @@ -14,9 +14,9 @@ id="svg2383" sodipodi:version="0.32" inkscape:version="0.46" - sodipodi:docname="arora.svg" + sodipodi:docname="endorphin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/jbache/icon/arora-16.png" + inkscape:export-filename="/home/jbache/icon/endorphin-16.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5"> image/svg+xml - Arora icon + Endorphin icon 1/5/2008 @@ -314,7 +314,7 @@ Cute polar bear - polar bear arora + polar bear endorphin diff --git a/src/data/arora.xml b/src/data/endorphin.xml similarity index 62% rename from src/data/arora.xml rename to src/data/endorphin.xml index 41d1a425..6f8876a4 100644 --- a/src/data/arora.xml +++ b/src/data/endorphin.xml @@ -3,12 +3,12 @@ - Arora - arora - arora %s - arora + Endorphin + endorphin + endorphin %s + endorphin false false - \ No newline at end of file + diff --git a/src/data/arora.xpm b/src/data/endorphin.xpm similarity index 99% rename from src/data/arora.xpm rename to src/data/endorphin.xpm index d446b8d0..6fd33d7f 100644 --- a/src/data/arora.xpm +++ b/src/data/endorphin.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * arora_xpm[] = { +static char * endorphin_xpm[] = { "32 32 563 2", " c None", ". c #6B7691", diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index ad6bb759..2bf07cff 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2008 Jason A. Donenfeld * * This program is free software; you can redistribute it and/or modify diff --git a/src/downloadmanager.h b/src/downloadmanager.h index 20355559..aecba983 100644 --- a/src/downloadmanager.h +++ b/src/downloadmanager.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2009 Benjamin C. Meyer + * Copyright 2008-2009 Aaron Dewes * Copyright 2008 Jason A. Donenfeld * * This program is free software; you can redistribute it and/or modify diff --git a/src/arora.desktop b/src/endorphin.desktop similarity index 87% rename from src/arora.desktop rename to src/endorphin.desktop index fc668e4b..e7268d5b 100755 --- a/src/arora.desktop +++ b/src/endorphin.desktop @@ -1,10 +1,10 @@ [Desktop Entry] -Name=Arora -Name[en_US]=Arora -Name[es]=Arora -Name[gl]=Arora -Name[sr]=Арора -Name[sr@latin]=Arora +Name=Endorphin +Name[en_US]=Endorphin +Name[es]=Endorphin +Name[gl]=Endorphin +Name[sr]=Endorphin +Name[sr@latin]=Endorphin Comment=Browse the World Wide Web Comment[ast]=Restola pola World Wide Web Comment[es]=Navegar por internet @@ -29,10 +29,10 @@ GenericName[sr]=Веб прегледач GenericName[sr@latin]=Web pregledač GenericName[nb_NO]=Nettleser GenericName[ja_JP]=Webブラウザ -Exec=arora %u +Exec=endorphin %u Terminal=false Type=Application -Icon=arora +Icon=endorphin Categories=Application;Qt;Network;WebBrowser; MimeType=text/html;text/xml;application/xhtml+xml;application/xml;image/gif;image/jpeg;image/png; StartupNotify=true diff --git a/src/history/history.cpp b/src/history/history.cpp index a59371f8..5045c899 100644 --- a/src/history/history.cpp +++ b/src/history/history.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/history/history.h b/src/history/history.h index ce4ae607..de064256 100644 --- a/src/history/history.h +++ b/src/history/history.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/history/historycompleter.h b/src/history/historycompleter.h index fd4af994..44f32f0f 100644 --- a/src/history/historycompleter.h +++ b/src/history/historycompleter.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * Copyright 2009 Benjamin K. Stuhl * * This program is free software; you can redistribute it and/or modify diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index 089add13..937d5865 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 @@ -80,7 +80,7 @@ // Fix so we don't have to include browserapplication. Reduces the size. QString HistoryManager::dataFilePath(const QString &fileName) { - QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Arora"; + QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin"; if (!QFile::exists(directory)) { QDir dir; dir.mkpath(directory); diff --git a/src/history/historymanager.h b/src/history/historymanager.h index ac401747..548ab6ab 100644 --- a/src/history/historymanager.h +++ b/src/history/historymanager.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Benjamin C. Meyer + * Copyright 2008 Aaron Dewes * * 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 diff --git a/src/htmls/startpage.html b/src/htmls/startpage.html index 78c788d3..127509e3 100644 --- a/src/htmls/startpage.html +++ b/src/htmls/startpage.html @@ -7,22 +7,22 @@ //' - + window.arora.translate('About Arora') + ''; - document.getElementById('lineEdit').placeholder = window.arora.translate('Search the Web with') + ' ' + searchEngine.name; + document.title = window.endorphin.translate('Welcome to Endorphin!'); + document.getElementById('headerTitle').innerHTML = window.endorphin.translate('Endorphin Start'); + document.getElementById('searchButton').value = window.endorphin.translate('Search!'); + document.getElementById('footer').innerHTML = window.endorphin.translate('Search results provided by') + ' ' + + searchEngine.name + ' | ' + '' + + window.endorphin.translate('About Endorphin') + ''; + document.getElementById('lineEdit').placeholder = window.endorphin.translate('Search the Web with') + ' ' + searchEngine.name; // Try to change the direction of the page: // This string is defined in QApplication // src/gui/kernel/qapplication.cpp#qt_detectRTLLanguage() // it should contain LTR or RTL - var newDir = window.arora.translate('QT_LAYOUT_DIRECTION'); + var newDir = window.endorphin.translate('QT_LAYOUT_DIRECTION'); newDir = newDir.toLowerCase(); if ((newDir != 'ltr') && (newDir != 'rtl')) newDir = 'ltr'; @@ -36,7 +36,7 @@ if (string.length == 0) return; - var url = window.arora.searchUrl(string); + var url = window.endorphin.searchUrl(string); window.location.href = url; } //]]> @@ -45,7 +45,7 @@