Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better placeholder text implementation #1150

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Better placeholder text implementation #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion workbench/src/plugin_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static gboolean plugin_workbench_init(GeanyPlugin *plugin, G_GNUC_UNUSED gpointe
/* At start there is no workbench open:
deactive save and close menu item and sidebar */
menu_set_context(MENU_CONTEXT_WB_CLOSED);
sidebar_show_intro_message(_("Create or open a workbench\nusing the workbench menu."), FALSE);
sidebar_show_intro_message(_("Create or open a workbench, using the workbench menu."), FALSE);

/* Init libgit2. */
git_libgit2_init();
Expand Down
27 changes: 20 additions & 7 deletions workbench/src/sidebar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ typedef struct SIDEBAR
GtkWidget *file_view;
GtkTreeStore *file_store;
GtkWidget *file_view_label;
GtkWidget *file_view_placeholder;
}SIDEBAR;
static SIDEBAR sidebar = {NULL, NULL, NULL, NULL};

Expand Down Expand Up @@ -855,8 +856,7 @@ static void sidebar_update_workbench(GtkTreeIter *iter, gint *position)
if (wb_globals.opened_wb == NULL)
{
gtk_label_set_text (GTK_LABEL(sidebar.file_view_label), _("No workbench opened."));
gtk_tree_store_clear(sidebar.file_store);
sidebar_show_intro_message(_("Create or open a workbench\nusing the workbench menu."), FALSE);
sidebar_show_intro_message(_("Create or open a workbench, using the workbench menu."), FALSE);
sidebar_deactivate();
}
else
Expand All @@ -882,9 +882,9 @@ static void sidebar_update_workbench(GtkTreeIter *iter, gint *position)
gtk_label_set_text (GTK_LABEL(sidebar.file_view_label), text);
if (count == 0)
{
gtk_tree_store_clear(sidebar.file_store);
sidebar_show_intro_message(_("Add a project using the context menu\n"
"or select \"Search projects\" from the menu."), TRUE);
sidebar_show_intro_message(
_("Add a project using the context menu or select \"Search projects\" from the menu."),
TRUE);
}
else
{
Expand Down Expand Up @@ -918,6 +918,7 @@ void sidebar_update (SIDEBAR_EVENT event, SIDEBAR_CONTEXT *context)
case SIDEBAR_CONTEXT_WB_OPENED:
case SIDEBAR_CONTEXT_PROJECT_ADDED:
case SIDEBAR_CONTEXT_PROJECT_REMOVED:
gtk_widget_hide(sidebar.file_view_placeholder);
sidebar_reset_tree_store();
sidebar_update_workbench(&iter, &position);
sidebar_insert_all_projects(&iter, &position);
Expand Down Expand Up @@ -1383,6 +1384,17 @@ void sidebar_init(void)
/**** label ****/
sidebar.file_view_label = gtk_label_new (_("No workbench opened."));
gtk_box_pack_start(GTK_BOX(sidebar.file_view_vbox), sidebar.file_view_label, FALSE, FALSE, 0);

/**** placeholder ****/
PangoAttrList *attrList = pango_attr_list_new ();
pango_attr_list_insert(attrList, pango_attr_style_new(PANGO_STYLE_ITALIC));
sidebar.file_view_placeholder = gtk_label_new (NULL);
gtk_label_set_line_wrap(GTK_LABEL(sidebar.file_view_placeholder), TRUE);
gtk_label_set_attributes(GTK_LABEL(sidebar.file_view_placeholder), attrList);
pango_attr_list_unref(attrList);
gtk_widget_hide(sidebar.file_view_placeholder);
gtk_widget_set_opacity(sidebar.file_view_placeholder, 0.75);
gtk_box_pack_start(GTK_BOX(sidebar.file_view_vbox), sidebar.file_view_placeholder, FALSE, FALSE, 0);

/**** tree view ****/

Expand Down Expand Up @@ -1447,8 +1459,9 @@ void sidebar_show_intro_message(const gchar *msg, gboolean activate)
{
GtkTreeIter iter;

gtk_tree_store_insert_with_values(sidebar.file_store, &iter, NULL, -1,
FILEVIEW_COLUMN_NAME, msg, -1);
sidebar_reset_tree_store();
gtk_label_set_text(GTK_LABEL(sidebar.file_view_placeholder), msg);
gtk_widget_show(sidebar.file_view_placeholder);
if (activate)
{
sidebar_activate();
Expand Down