diff --git a/.gitignore b/.gitignore index 8698d7ecb..c623549e3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ Makefile* TestPlugin-build search_* src-* +bin/qupzilla +bin/plugins/libExamplePlugin.so +*.autosave diff --git a/AUTHORS b/AUTHORS index 27d51ef84..fc5616e56 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,5 @@ nowrep + +Contributors: +Heimen Stoffels - Dutch Translation +Peter Vacula - Slovak Translation diff --git a/BUILDING b/BUILDING index 37b497204..b2a65800e 100644 --- a/BUILDING +++ b/BUILDING @@ -54,7 +54,7 @@ Windows specific defines W7API Build QupZilla with Windows 7 API support Requires Microsoft Visual C++ Compiler 2010 - (enabled by default) + (disabled by default) Linux / Unix specific defines: NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path diff --git a/README b/README index c08d9812c..1d4d03a83 100644 --- a/README +++ b/README @@ -3,6 +3,17 @@ ################################# Version: 1.0.0-rc1 +Windows: + use precompiled windows installer in downloads + +Unix: + cd src/ + qmake + make + make install + +You may need to run make install as root. + NOTE: Before building, please read BUILDING informations. Thank You! QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org diff --git a/TODO b/TODO index 45f82e09c..824c0c1e0 100644 --- a/TODO +++ b/TODO @@ -13,3 +13,4 @@ Note: They are not sorted by priority. 5. Zoom Widget in statusbar 6. Save more than one account for site + input completer 7. Better SSL Manager +8. Accept-Language dialog + send this header diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 650c516a6..000000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -qupzilla diff --git a/bin/plugins/.gitignore b/bin/plugins/.gitignore deleted file mode 100644 index 07f9dae00..000000000 --- a/bin/plugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libExamplePlugin.so diff --git a/linux/applications/qupzilla.desktop b/linux/applications/qupzilla.desktop new file mode 100644 index 000000000..e282c3c63 --- /dev/null +++ b/linux/applications/qupzilla.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=QupZilla +Comment=A fast and secure web browser +Comment[cs]=Rychlý a bezpečný webový prohlížeč +Comment[sk]=Rychlý a bezpečný webový prehliadač +GenericName=Web Browser +GenericName[cs]=Webový prohlížeč +GenericName[sk]=Webový prehliadač +Exec=qupzilla %u +MimeType=text/html;application/xhtml+xml; +Terminal=false +Type=Application +Icon=qupzilla.png +Categories=Network;WebBrowser; diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png new file mode 100644 index 000000000..c4856bed5 Binary files /dev/null and b/linux/pixmaps/qupzilla.png differ diff --git a/src/QupZilla.pro b/src/QupZilla.pro index e4093a77c..f0cec0a8c 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -15,17 +15,22 @@ MOC_DIR = ../build RCC_DIR = ../build UI_DIR = ../build -##It won't compile on windows with this define -##Some bug in qtsingleapp / qvector template -!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT +# Please read BUILD informations # +#win32:DEFINES += UNRELEASED_BUILD +#win32:DEFINES += NO_SYSTEM_DATAPATH +#win32:DEFINES += W7API unix:QT += dbus -win32:DEFINES += W7API win32:RC_FILE = appicon.rc win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib +##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template +!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT + TRANSLATIONS +=cs_CZ.ts\ - sk_SK.ts + sk_SK.ts\ + nl_NL.ts\ + es.ts INCLUDEPATH += 3rdparty\ app\ @@ -286,21 +291,18 @@ OTHER_FILES += \ include(3rdparty/qtsingleapplication.pri) +unix { + target.path = /usr/bin + target1.files = ../bin/data + target1.files += ../bin/locale + target1.files += ../bin/plugins + target1.files += ../bin/themes + target1.path = /usr/share/qupzilla + target2.files = ../linux/applications + target2.files += ../linux/pixmaps + target2.path = /usr/share - - - - - - - - - - - - - - - + INSTALLS += target target1 target2 +}