diff --git a/BUILDING.md b/BUILDING.md index 7d232f69..a918fada 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -1,6 +1,6 @@ ## BUILD INSTRUCTIONS AND REQUIREMENTS ## -Database Browser for SQLite requires Trolltech's Qt, version 4.6 or newer. +DB Browser for SQLite requires Trolltech's Qt, version 4.6 or newer. For more information on Qt please consult http://www.qtsoftware.com. The GPL version of Qt is available in almost all Linux distributions as a default package. @@ -72,7 +72,7 @@ done. ## Compiling and running the Unit Tests ## -SQLite Browser has unit tests in the "tests" subdirectory. +DB Browser for SQLite has unit tests in the "tests" subdirectory. ### Compile the unit tests ### @@ -91,7 +91,7 @@ $ make Then run them like this: ``` -$ ./sqlb-unittests +$ ./sqlb-unittests ********* Start testing of TestTable ********* Config: Using QTest library 4.8.6, Qt 4.8.6 PASS : TestTable::initTestCase() diff --git a/CMakeLists.txt b/CMakeLists.txt index 0656b9ab..d7624d02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,7 +228,7 @@ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib) #cpack -set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Database Browser for SQLite") +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "DB Browser for SQLite") set(CPACK_PACKAGE_VENDOR "oldsch00l") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") @@ -241,7 +241,7 @@ if(WIN32 AND NOT UNIX) # sure there is at least one set of four (4) backlasshes. set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\src\\\\iconwin.ico") set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\sqlitebrowser.exe") - set(CPACK_NSIS_DISPLAY_NAME "Database Browser for SQLite") + set(CPACK_NSIS_DISPLAY_NAME "DB Browser for SQLite") set(CPACK_NSIS_HELP_LINK "https:\\\\\\\\github.com\\\\sqlitebrowser\\\\sqlitebrowser") set(CPACK_NSIS_URL_INFO_ABOUT "https:\\\\\\\\github.com\\\\sqlitebrowser\\\\sqlitebrowser") set(CPACK_NSIS_CONTACT "peinthor@gmail.com") diff --git a/LICENSE b/LICENSE index cd0cb76b..b6a53db3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Database Browser for SQLite is bi-licensed under the Mozilla Public License +DB Browser for SQLite is bi-licensed under the Mozilla Public License Version 2, as well as the GNU General Public License Version 3 or later. You can modify or redistribute it under the conditions of these diff --git a/README.md b/README.md index 933f0003..4c2af72d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Database Browser for SQLite +# DB Browser for SQLite [![Build Status](https://travis-ci.org/sqlitebrowser/sqlitebrowser.svg?branch=master)](https://travis-ci.org/sqlitebrowser/sqlitebrowser) -![Database Browser for SQLite Screenshot](https://github.com/sqlitebrowser/sqlitebrowser/raw/master/images/sqlitebrowser.png "Database Browser for SQLite Screenshot") +![DB Browser for SQLite Screenshot](https://github.com/sqlitebrowser/sqlitebrowser/raw/master/images/sqlitebrowser.png "DB Browser for SQLite Screenshot") ## What it is -Database Browser for SQLite is a high quality, visual, open source tool to +DB Browser for SQLite is a high quality, visual, open source tool to create, design, and edit database files compatible with SQLite. It is for users and developers wanting to create databases, search, and edit @@ -73,7 +73,7 @@ Nightly builds are also available at: ## MacOS X -Database Browser for SQLite works well on MacOS X. +DB Browser for SQLite works well on MacOS X. * OSX 10.6 (Snow Leopard) - 10.9 (Mavericks) are tested and known to work @@ -191,9 +191,12 @@ the request of [Richard Hipp](http://www.hwaci.com/drh) (creator of [SQLite](http://sqlite.org)), as the previous name was creating unintended support issues. +In September 2014, the project was renamed to "DB Browser for SQLite", to ++avoid confusion with an existing application called "Database Browser". + ## License -Database Browser for SQLite is bi-licensed under the Mozilla Public License +DB Browser for SQLite is bi-licensed under the Mozilla Public License Version 2, as well as the GNU General Public License Version 3 or later. You can modify or redistribute it under the conditions of these licenses. diff --git a/distri/sqlitebrowser.desktop b/distri/sqlitebrowser.desktop index b5c11da1..0e2f8b51 100644 --- a/distri/sqlitebrowser.desktop +++ b/distri/sqlitebrowser.desktop @@ -1,7 +1,7 @@ [Desktop Entry] -Name=SQLiteBrowser -Comment=SQLiteBrowser is a light GUI editor for SQLite databases -Comment[de]=SQLiteBrowser ist ein GUI-Editor für SQLite-Datenbanken +Name=DB Browser for SQLite +Comment=DB Browser for SQLite is a light GUI editor for SQLite databases +Comment[de]=DB Browser for SQLite ist ein GUI-Editor für SQLite-Datenbanken Exec=sqlitebrowser %f Icon=/usr/share/sqlitebrowser/sqlitebrowser.svg Terminal=false diff --git a/src/AboutDialog.ui b/src/AboutDialog.ui index 06591e18..b75fa8bc 100644 --- a/src/AboutDialog.ui +++ b/src/AboutDialog.ui @@ -11,7 +11,7 @@ - About Database Browser for SQLite + About DB Browser for SQLite @@ -116,7 +116,7 @@ - <html><head/><body><p>Database Browser for SQLite is an open source, freeware visual tool used to create, design and edit SQLite database files.</p><p>It is bi-licensed under the Mozilla Public License Version 2, as well as the GNU General Public License Version 3 or later. You can modify or redistribute it under the conditions of these licenses.</p><p>See <a href="http://www.gnu.org/licenses/gpl.html"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/gpl.html</span></a> and <a href="https://www.mozilla.org/MPL/2.0/index.txt"><span style=" text-decoration: underline; color:#0000ff;">https://www.mozilla.org/MPL/2.0/index.txt</span></a> for details.</p><p>For more information on this program please visit our website at: <a href="http://sqlitebrowser.org"><span style=" text-decoration: underline; color:#0000ff;">http://sqlitebrowser.org</span></a></p><p><span style=" font-size:small;">This software uses the GPL/LGPL Qt Toolkit from </span><a href="http://qt-project.org/"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://qt-project.org/</span></a><span style=" font-size:small;"><br/>See </span><a href="http://qt-project.org/doc/qt-5/licensing.html"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://qt-project.org/doc/qt-5/licensing.html</span></a><span style=" font-size:small;"> for licensing terms and information.</span></p><p><span style=" font-size:small;">It also uses the Silk icon set by Mark James licensed under a Creative Commons Attribution 2.5 and 3.0 license.<br/>See </span><a href="http://www.famfamfam.com/lab/icons/silk/"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://www.famfamfam.com/lab/icons/silk/</span></a><span style=" font-size:small;"> for details.</span></p></body></html> + <html><head/><body><p>DB Browser for SQLite is an open source, freeware visual tool used to create, design and edit SQLite database files.</p><p>It is bi-licensed under the Mozilla Public License Version 2, as well as the GNU General Public License Version 3 or later. You can modify or redistribute it under the conditions of these licenses.</p><p>See <a href="http://www.gnu.org/licenses/gpl.html"><span style=" text-decoration: underline; color:#0000ff;">http://www.gnu.org/licenses/gpl.html</span></a> and <a href="https://www.mozilla.org/MPL/2.0/index.txt"><span style=" text-decoration: underline; color:#0000ff;">https://www.mozilla.org/MPL/2.0/index.txt</span></a> for details.</p><p>For more information on this program please visit our website at: <a href="http://sqlitebrowser.org"><span style=" text-decoration: underline; color:#0000ff;">http://sqlitebrowser.org</span></a></p><p><span style=" font-size:small;">This software uses the GPL/LGPL Qt Toolkit from </span><a href="http://qt-project.org/"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://qt-project.org/</span></a><span style=" font-size:small;"><br/>See </span><a href="http://qt-project.org/doc/qt-5/licensing.html"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://qt-project.org/doc/qt-5/licensing.html</span></a><span style=" font-size:small;"> for licensing terms and information.</span></p><p><span style=" font-size:small;">It also uses the Silk icon set by Mark James licensed under a Creative Commons Attribution 2.5 and 3.0 license.<br/>See </span><a href="http://www.famfamfam.com/lab/icons/silk/"><span style=" font-size:small; text-decoration: underline; color:#0000ff;">http://www.famfamfam.com/lab/icons/silk/</span></a><span style=" font-size:small;"> for details.</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop diff --git a/src/Application.cpp b/src/Application.cpp index 760edea4..e74f2e8d 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -13,7 +13,7 @@ Application::Application(int& argc, char** argv) : { // Set organisation and application names setOrganizationName("sqlitebrowser"); - setApplicationName("Database Browser for SQLite"); + setApplicationName("DB Browser for SQLite"); // Set character encoding to UTF8 QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index e1433a46..450c1de6 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -202,7 +202,7 @@ bool MainWindow::fileOpen(const QString& fileName) setCurrentFile(wFile); retval = true; } else { - // Failed opening file; so it might be a SQLiteBrowser project file + // Failed opening file; so it might be a project file instead return loadProject(wFile); } loadExtensionsFromSettings(); @@ -1376,7 +1376,7 @@ void MainWindow::httpresponse(QNetworkReply *reply) msgBox.addButton(QMessageBox::Ok); msgBox.setTextFormat(Qt::RichText); msgBox.setWindowTitle(tr("New version available.")); - msgBox.setText(tr("A new sqlitebrowser version is available (%1.%2.%3).

" + msgBox.setText(tr("A new DB Browser for SQLite version is available (%1.%2.%3).

" "Please download at %4.").arg(major).arg(minor).arg(patch). arg(QString(reply->readLine()).trimmed())); msgBox.exec(); @@ -1722,7 +1722,7 @@ bool MainWindow::loadProject(QString filename) filename = QFileDialog::getOpenFileName(this, tr("Choose a file to open"), QString(), - tr("SQLiteBrowser project(*.sqbpro)")); + tr("DB Browser for SQLite project file (*.sqbpro)")); } if(!filename.isEmpty()) @@ -1862,7 +1862,7 @@ void MainWindow::saveProject() QString filename = QFileDialog::getSaveFileName(this, tr("Choose a filename to save under"), QString(), - tr("SQLiteBrowser project(*.sqbpro)") + tr("DB Browser for SQLite project file (*.sqbpro)") ); if(!filename.isEmpty()) { diff --git a/src/MainWindow.ui b/src/MainWindow.ui index e1acf50c..b04b0f0c 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -11,7 +11,7 @@ - SQLiteBrowser + DB Browser for SQLite diff --git a/src/app.plist b/src/app.plist index 8b113b1d..f5efb2ac 100644 --- a/src/app.plist +++ b/src/app.plist @@ -26,7 +26,7 @@ sqbpro CFBundleTypeName - SQLiteBrowser Project + DB Browser for SQLite Project CFBundleTypeOSTypes **** @@ -52,7 +52,7 @@ CFBundleExecutable @EXECUTABLE@ CFBundleGetInfoString - Database Browser for SQLite + DB Browser for SQLite CFBundleIconFile @ICON@ CFBundleIdentifier @@ -60,7 +60,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - Database Browser for SQLite + DB Browser for SQLite CFBundlePackageType APPL CFBundleShortVersionString