Renamed project to "DB Browser for SQLite"

shrishaster · Sep 21, 2014 · 05207b0 · 05207b0
1 parent c615e9a
commit 05207b0
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>About Database Browser for SQLite</string>
+   <string>About DB Browser for SQLite</string>
   </property>
   <property name="windowIcon">
    <iconset resource="icons/icons.qrc">
@@ -116,7 +116,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Database Browser for SQLite is an open source, freeware visual tool used to create, design and edit SQLite database files.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;See &lt;a href=&quot;http://www.gnu.org/licenses/gpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses/gpl.html&lt;/span&gt;&lt;/a&gt; and &lt;a href=&quot;https://www.mozilla.org/MPL/2.0/index.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.mozilla.org/MPL/2.0/index.txt&lt;/span&gt;&lt;/a&gt; for details.&lt;/p&gt;&lt;p&gt;For more information on this program please visit our website at: &lt;a href=&quot;http://sqlitebrowser.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://sqlitebrowser.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;This software uses the GPL/LGPL Qt Toolkit from &lt;/span&gt;&lt;a href=&quot;http://qt-project.org/&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://qt-project.org/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt;&lt;br/&gt;See &lt;/span&gt;&lt;a href=&quot;http://qt-project.org/doc/qt-5/licensing.html&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://qt-project.org/doc/qt-5/licensing.html&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt; for licensing terms and information.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;It also uses the Silk icon set by Mark James licensed under a Creative Commons Attribution 2.5 and 3.0 license.&lt;br/&gt;See &lt;/span&gt;&lt;a href=&quot;http://www.famfamfam.com/lab/icons/silk/&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.famfamfam.com/lab/icons/silk/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt; for details.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;DB Browser for SQLite is an open source, freeware visual tool used to create, design and edit SQLite database files.&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;See &lt;a href=&quot;http://www.gnu.org/licenses/gpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses/gpl.html&lt;/span&gt;&lt;/a&gt; and &lt;a href=&quot;https://www.mozilla.org/MPL/2.0/index.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.mozilla.org/MPL/2.0/index.txt&lt;/span&gt;&lt;/a&gt; for details.&lt;/p&gt;&lt;p&gt;For more information on this program please visit our website at: &lt;a href=&quot;http://sqlitebrowser.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://sqlitebrowser.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;This software uses the GPL/LGPL Qt Toolkit from &lt;/span&gt;&lt;a href=&quot;http://qt-project.org/&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://qt-project.org/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt;&lt;br/&gt;See &lt;/span&gt;&lt;a href=&quot;http://qt-project.org/doc/qt-5/licensing.html&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://qt-project.org/doc/qt-5/licensing.html&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt; for licensing terms and information.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;It also uses the Silk icon set by Mark James licensed under a Creative Commons Attribution 2.5 and 3.0 license.&lt;br/&gt;See &lt;/span&gt;&lt;a href=&quot;http://www.famfamfam.com/lab/icons/silk/&quot;&gt;&lt;span style=&quot; font-size:small; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.famfamfam.com/lab/icons/silk/&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:small;&quot;&gt; for details.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

diff --git 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
@@ -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).<br/><br/>"
+                msgBox.setText(tr("A new DB Browser for SQLite version is available (%1.%2.%3).<br/><br/>"
                                   "Please download at <a href='%4'>%4</a>.").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
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>SQLiteBrowser</string>
+   <string>DB Browser for SQLite</string>
   </property>
   <property name="windowIcon">
    <iconset resource="icons/icons.qrc">

diff --git a/src/app.plist b/src/app.plist
@@ -26,7 +26,7 @@
 				<string>sqbpro</string>
 			</array>
 			<key>CFBundleTypeName</key>
-			<string>SQLiteBrowser Project</string>
+			<string>DB Browser for SQLite Project</string>
 			<key>CFBundleTypeOSTypes</key>
 			<array>
 				<string>****</string>
@@ -52,15 +52,15 @@
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Database Browser for SQLite</string>
+	<string>DB Browser for SQLite</string>
 	<key>CFBundleIconFile</key>
 	<string>@ICON@</string>
 	<key>CFBundleIdentifier</key>
 	<string>net.sourceforge.sqlitebrowser</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Database Browser for SQLite</string>
+	<string>DB Browser for SQLite</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>