Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rename Bibledit-Gtk to Bibledit-Desktop throughout source code.
  • Loading branch information
postiffm committed May 25, 2017
1 parent 48a2776 commit 10a4e2f
Show file tree
Hide file tree
Showing 19 changed files with 35 additions and 31 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Expand Up @@ -27,10 +27,14 @@ autom4te.cache
*.o
*.m4
*.exe
*.gmo
*.mo

# Binaries
git/bibledit-git
shutdown/bibledit-shutdown
src/bibledit-desktop
# Old name:
src/bibledit-gtk
src/bibledit-rdwrt
src/concordance
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
@@ -1,6 +1,6 @@
bin_PROGRAMS = bibledit-gtk bibledit-rdwrt concordance
bin_PROGRAMS = bibledit-desktop bibledit-rdwrt concordance

bibledit_gtk_SOURCES = \
bibledit_desktop_SOURCES = \
bibledit.cpp \
options.cpp \
chapterview.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/assistantexport.cpp
Expand Up @@ -397,7 +397,7 @@ radiobutton_select_type_references = gtk_radio_button_new_with_mnemonic (NULL, _

GSList *radiobutton_stylesheet_export_type_group = NULL;

radiobutton_stylesheet_format_bibledit = gtk_radio_button_new_with_mnemonic (NULL, _("Standard Bibledit-Gtk format"));
radiobutton_stylesheet_format_bibledit = gtk_radio_button_new_with_mnemonic (NULL, _("Standard Bibledit-Desktop format"));
gtk_widget_show (radiobutton_stylesheet_format_bibledit);
gtk_box_pack_start (GTK_BOX (vbox_stylesheet_format), radiobutton_stylesheet_format_bibledit, FALSE, FALSE, 0);
gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_stylesheet_format_bibledit), radiobutton_stylesheet_export_type_group);
Expand Down
2 changes: 1 addition & 1 deletion src/dialogbooknames.cpp
Expand Up @@ -104,7 +104,7 @@ BooknamesDialog::BooknamesDialog(const map <unsigned int, ustring>& books, const
gtk_tree_view_set_model(GTK_TREE_VIEW(treeview1), GTK_TREE_MODEL(model));
g_object_unref(model);
GtkCellRenderer *renderer1 = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, "Book in Bibledit-Gtk", renderer1, "text", COLUMN_BIBLEDIT, NULL);
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, "Book in Bibledit-Desktop", renderer1, "text", COLUMN_BIBLEDIT, NULL);
GtkCellRenderer *renderer2 = gtk_cell_renderer_text_new();
g_signal_connect(renderer2, "edited", G_CALLBACK(cell_edited), gpointer(this));
gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, heading2, renderer2, "text", COLUMN_URL, "editable", COLUMN_EDITABLE, NULL);
Expand Down
4 changes: 2 additions & 2 deletions src/dialogcheck.cpp
Expand Up @@ -1138,7 +1138,7 @@ void CheckDialog::word_count_setup()
gtk_widget_show(wordcount_label2);
gtk_box_pack_start(GTK_BOX(wordcount_hbox1), wordcount_label2, FALSE, FALSE, 0);

wordcount_label1 = gtk_label_new_with_mnemonic(_("Bibledit-Gtk normally knows the right word boundaries, but if this is not done satisfactorily, you can enter _extra characters that should be part of a word"));
wordcount_label1 = gtk_label_new_with_mnemonic(_("Bibledit-Desktop normally knows the right word boundaries, but if this is not done satisfactorily, you can enter _extra characters that should be part of a word"));
gtk_widget_show(wordcount_label1);
gtk_box_pack_start(GTK_BOX(vbox1), wordcount_label1, FALSE, FALSE, 0);
gtk_label_set_line_wrap(GTK_LABEL(wordcount_label1), TRUE);
Expand Down Expand Up @@ -1186,7 +1186,7 @@ void CheckDialog::on_wordcount_entry1()
ustring non_alphas = get_non_alphanumericals(chars);
if (chars != non_alphas) {
gtk_entry_set_text(GTK_ENTRY(wordcount_entry1), non_alphas.c_str());
gtkw_dialog_info(checkdialog, _("Bibledit-Gtk already recognizes this character as part of a word.\nIt has been removed as superfluous.\nThere is no need to enter your alphabet.\nEntering the special cases is enough."));
gtkw_dialog_info(checkdialog, _("Bibledit-Desktop already recognizes this character as part of a word.\nIt has been removed as superfluous.\nThere is no need to enter your alphabet.\nEntering the special cases is enough."));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/dialoggui.cpp
Expand Up @@ -143,7 +143,7 @@ void GuiDialog::on_okbutton()

// Restart needed if there was a change in the features.
if ((old_mode != new_mode) || (old_list != new_list)) {
gtkw_dialog_info(featuresdialog, "The changes will take effect after Bibledit-Gtk has been restarted");
gtkw_dialog_info(featuresdialog, "The changes will take effect after Bibledit-Desktop has been restarted");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/dialogmaintenance.cpp
Expand Up @@ -154,7 +154,7 @@ void MaintenanceDialog::load_webview (const gchar * url)
htmlwriter.text_add ("Maintenance");
htmlwriter.heading_close ();
htmlwriter.paragraph_open();
htmlwriter.text_add (_("Some actions may have great impact on Bibledit-Gtk. Use with care."));
htmlwriter.text_add (_("Some actions may have great impact on Bibledit-Desktop. Use with care."));
htmlwriter.paragraph_close();

// Mechon Mamre Hebrew text link.
Expand Down
6 changes: 3 additions & 3 deletions src/directories.cpp
Expand Up @@ -76,11 +76,11 @@ directories::directories(char *argv0)
// answer we have pre-computed.
#ifdef WIN32
// A clever way to take a path like C:\Program
// Files\Bibledit-Gtk\editor\bin\ and chop the
// last component to get back to <something>\Bibledit-Gtk\editor...
// Files\Bibledit-Desktop\editor\bin\ and chop the
// last component to get back to <something>\Bibledit-Desktop\editor...
package_data = gw_path_get_dirname(rundir);
// ... Then add two more dirs back on, resulting in
// <something>Bibledit-Gtk\editor\share\bibledit
// <something>Bibledit-Desktop\editor\share\bibledit
package_data = gw_build_filename(package_data, "share", "bibledit");
#else
// For Linux, this is hard-coded to match the variable set in config.h
Expand Down
4 changes: 2 additions & 2 deletions src/directories.h
Expand Up @@ -38,9 +38,9 @@ class directories {
// Directory bibledit is run from (e.g. /usr/bin or
// C:\Program Files\Bibledit\editor\bin)
ustring rundir;
// Executable name (e.g. bibledit-gtk)
// Executable name (e.g. bibledit-desktop)
ustring exename;
// Package data directory (e.g. /usr/share/bibledit-gtk or
// Package data directory (e.g. /usr/share/bibledit-desktop or
// C:\Program Files\Bibledit\editor\share\bibledit)
ustring package_data;
ustring home;
Expand Down
4 changes: 2 additions & 2 deletions src/kjv.cpp
Expand Up @@ -51,7 +51,7 @@ void kjv_detailed_page (HtmlWriter2& htmlwriter)
htmlwriter.text_add (_("Sword King James Bible with Strong's lemmata"));
htmlwriter.heading_close ();
htmlwriter.paragraph_open();
htmlwriter.text_add (_("The King James Bible from the Sword project is useful for its Strong's numbers tagged in the text. Bibledit-Gtk uses this to find related verses, among other things. Importing consists of two steps: exporting it from Sword and creating a database out of it."));
htmlwriter.text_add (_("The King James Bible from the Sword project is useful for its Strong's numbers tagged in the text. Bibledit-Desktop uses this to find related verses, among other things. Importing consists of two steps: exporting it from Sword and creating a database out of it."));
htmlwriter.paragraph_close();
htmlwriter.heading_open (4);
htmlwriter.text_add (_("1. Exporting the text from Sword"));
Expand Down Expand Up @@ -125,7 +125,7 @@ void kjv_action_page (HtmlWriter2& htmlwriter)
htmlwriter.heading_close ();
if (keep_going) {
htmlwriter.paragraph_open ();
htmlwriter.text_add (_("To use the database, copy the file kjv.sql into the Bibledit-Gtk package and re-install."));
htmlwriter.text_add (_("To use the database, copy the file kjv.sql into the Bibledit-Desktop package and re-install."));
htmlwriter.paragraph_close ();
}
for (unsigned int i = 0; i < messages.size(); i++) {
Expand Down
2 changes: 1 addition & 1 deletion src/layout.cpp
Expand Up @@ -147,7 +147,7 @@ void ScreenLayoutDimensions::timeout()
// gtk_window_resize (mywindow, width, height);
#ifndef DARWIN
// Function gtk_window_move crashes on some version of Mac OS X
// when bibledit-gtk is installed through macports.
// when bibledit-desktop is installed through macports.
gtk_window_move (mywindow, x, y);
#endif
}
Expand Down
4 changes: 2 additions & 2 deletions src/mainwindow.cpp
Expand Up @@ -190,7 +190,7 @@ navigation(0), httpd(0)
interprocess_communications_initiate_listener_message_id = 0;

// Application name.
g_set_application_name("Bibledit-Gtk");
g_set_application_name("Bibledit-Desktop");

// Gui Features object.
GuiFeatures guifeatures(0);
Expand Down Expand Up @@ -5274,7 +5274,7 @@ void MainWindow::handle_editor_focus()
check_usfm_window_ping ();

// Set the title of the main window to include the project.
ustring title = "Bibledit-Gtk";
ustring title = "Bibledit-Desktop";
if (!project.empty()) {
title.append (" - ");
title.append (project);
Expand Down
2 changes: 1 addition & 1 deletion src/mechonmamre.cpp
Expand Up @@ -67,7 +67,7 @@ void mechon_mamre_detailed_page (HtmlWriter2& htmlwriter)
htmlwriter.text_add ("Hebrew Bible with cantillation marks from Mechon Mamre");
htmlwriter.heading_close ();
htmlwriter.paragraph_open();
htmlwriter.text_add ("The Hebrew Bible from Mechon Mamre provides a Hebrew text that can be useful for translating the Bible. Bibledit-Gtk can import this text. This consists of two steps: downloading it and importing it.");
htmlwriter.text_add ("The Hebrew Bible from Mechon Mamre provides a Hebrew text that can be useful for translating the Bible. Bibledit-Desktop can import this text. This consists of two steps: downloading it and importing it.");
htmlwriter.paragraph_close();
htmlwriter.heading_open (4);
htmlwriter.text_add ("1. Downloading the text");
Expand Down
2 changes: 1 addition & 1 deletion src/merge_utils.cpp
Expand Up @@ -234,7 +234,7 @@ void merge_editor_and_file (vector <ustring> merge_base,
// If PHP is not available, skip running the filter to avoid complete data loss.
if (!gw_find_program_in_path ("php")) {
gw_message (_("Cannot find PHP."));
gw_message (_("Bibledit-Gtk needs PHP for improved collaboration and merging."));
gw_message (_("Bibledit-Desktop needs PHP for improved collaboration and merging."));
gw_message (_("Some changes were lost."));
gw_message (_("Install package php5-cli."));
return;
Expand Down
2 changes: 1 addition & 1 deletion src/paratext.cpp
Expand Up @@ -34,7 +34,7 @@ ExportParatextStylesheet::ExportParatextStylesheet (int dummy)
}
// Indicate it was exported from bibledit.
if (!stylesheet_lines.empty()) {
stylesheet_lines[0].append (_("# Exported from Bibledit-Gtk"));
stylesheet_lines[0].append (_("# Exported from Bibledit-Desktop"));
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/readwrite.cpp
Expand Up @@ -39,10 +39,10 @@ Breaking the syntax down we have:
First parameter: -r|-w
This can be either -r or -w which determines whether the remaining arguments are going to do a "read" operation
from the specified Bibledit-Gtk Bible / project, or do a "write" operation to that Bible / project.
from the specified Bibledit-Desktop Bible / project, or do a "write" operation to that Bible / project.
Second parameter: project
This gives the name of the Bibledit-Gtk Bible / project.
This gives the name of the Bibledit-Desktop Bible / project.
All we have to do is ensure that the project name we want to access is a valid/existing one.
Third parameter: book
Expand All @@ -57,7 +57,7 @@ Fifth parameter: fileName
This is a temporary file name that we assign for our use with bibledit-rdwrt.
For a read (-r) operation this fileName argument is the name of the file that will be created by bibledit-rdwrt
containing a copy of the whole book (corresponding to the 3-letter code),
or that contains the individual chapter contents (of a designated chapter) of an existing Bibledit-Gtk book file
or that contains the individual chapter contents (of a designated chapter) of an existing Bibledit-Desktop book file
in the Bible / project. It should be prefixed with a path us.
Since bibledit-rdwrt is a console operation, after AdaptIt calls it using ::wxExecute,
it would need to read the resulting temporary file to grab the contents for its use.
Expand Down Expand Up @@ -98,7 +98,7 @@ It may write to stdout or stderr, as it sees fit.
}

// Fourth parameter: chapter | 0.
// Bibledit-Gtk supports chapter 0.
// Bibledit-Desktop supports chapter 0.
// But here it is different. Chapter 0 means to read/write the whole book, not chapter 0.
// A chapter number other than 0 refers to that particular chapter.
int chapter = ABS (convert_to_int (argv[4]));
Expand Down
2 changes: 1 addition & 1 deletion src/restore.cpp
Expand Up @@ -60,7 +60,7 @@ void restore_notes (const ustring& unpack_directory, vector <ustring>& feedback)
unsigned int current_count = notes_count ();
feedback.push_back (_("Notes available before restore: ") + convert_to_string (current_count));
if (current_count > 0) {
ustring question = _("Currently Bibledit-Gtk has ") + convert_to_string (current_count) + _(" notes. Would you like to overwrite these?");
ustring question = _("Currently Bibledit-Desktop has ") + convert_to_string (current_count) + _(" notes. Would you like to overwrite these?");
if (gtkw_dialog_question(NULL, question, GTK_RESPONSE_NO) == GTK_RESPONSE_YES) {
feedback.push_back (_("Restore has overwritten the existing notes"));
} else {
Expand Down
8 changes: 4 additions & 4 deletions src/startup.cpp
Expand Up @@ -35,7 +35,7 @@ bool check_bibledit_startup_okay (int argc, char *argv[])
#ifndef WIN32
bool root = (getuid() == 0);
if (root) {
gtkw_dialog_error(NULL, _("Bibledit-Gtk has not been designed to run as user root.\nPlease run it as a standard user."));
gtkw_dialog_error(NULL, _("Bibledit-Desktop has not been designed to run as user root.\nPlease run it as a standard user."));
return false;
}
#endif
Expand All @@ -49,14 +49,14 @@ bool check_bibledit_startup_okay (int argc, char *argv[])
}

// See whether Bibledit itself is running already.
if (programs_running_count("bibledit-gtk") > 1) {
gtkw_dialog_error(NULL, _("Bibledit-Gtk is already running."));
if (programs_running_count("bibledit-desktop") > 1) {
gtkw_dialog_error(NULL, _("bibledit-besktop is already running."));
return false;
}

// See whether Bibledit is shutting down.
if (program_is_running ("bibledit-shutdown")) {
gtkw_dialog_error(NULL, _("The previous instance of Bibledit-Gtk is still optimizing its data while shutting down.\nPlease wait till that has been done, and try again."));
gtkw_dialog_error(NULL, _("The previous instance of bibledit-desktop is still optimizing its data while shutting down.\nPlease wait till that has been done, and try again."));
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/xetex.cpp
Expand Up @@ -86,7 +86,7 @@ void XeTeX::write_document_tex_file ()
extern Styles * styles;
Stylesheet * sheet = styles->stylesheet (stylesheet_get_actual ());

document_tex.push_back (_("% Configuration file created by Bibledit-Gtk"));
document_tex.push_back (_("% Configuration file created by Bibledit-Desktop"));
document_tex.push_back (_("% You can modify it to suit your needs"));
document_tex.push_back (_("% After modification, run the following command in this directory:"));
document_tex.push_back (_("% xetex document.tex"));
Expand Down

0 comments on commit 10a4e2f

Please sign in to comment.