Make contact the default text plugin

And rename the old text plugin "tribar"

https://bugs.freedesktop.org/show_bug.cgi?id=55286

diff --git a/configure.ac b/configure.ac
index 6f74d75a64b265fa152b62ba676ed30cd6f97262..65ab02e432c973981069879d59eeba2676ee6bb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -277,7 +277,7 @@ AC_CONFIG_FILES([Makefile
            src/plugins/splash/Makefile
            src/plugins/splash/throbgress/Makefile
            src/plugins/splash/fade-throbber/Makefile
-           src/plugins/splash/contact/Makefile
+           src/plugins/splash/tribar/Makefile
            src/plugins/splash/text/Makefile
            src/plugins/splash/details/Makefile
            src/plugins/splash/space-flares/Makefile
@@ -296,7 +296,7 @@ AC_CONFIG_FILES([Makefile
            themes/Makefile
            themes/spinfinity/Makefile
            themes/fade-in/Makefile
-           themes/contact/Makefile
+           themes/tribar/Makefile
            themes/text/Makefile
            themes/details/Makefile
            themes/solar/Makefile

diff --git a/src/plugins/splash/Makefile.am b/src/plugins/splash/Makefile.am
index 72e73c0c9f0768654ef27ea64c2f102d5a32c242..a19197b9b4cb89b56ff3634f5486e025f36f9c61 100644 (file)
--- a/src/plugins/splash/Makefile.am
+++ b/src/plugins/splash/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = throbgress fade-throbber text details space-flares two-step script contact
+SUBDIRS = throbgress fade-throbber text details space-flares two-step script tribar
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
index af8163568d0695b21668bbc666eb306f16e7cc07..fb97c14c824c84cc1c0e79b96b5b1ade4c91b20d 100644 (file)
--- a/src/plugins/splash/text/plugin.c
+++ b/src/plugins/splash/text/plugin.c
@@ -1,6 +1,5 @@
-/* text.c - boot splash plugin
- *
- * Copyright (C) 2008 Red Hat, Inc.
+/*
+ * Copyright (C) 2008-2012 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +16,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
- * Written by: Adam Jackson <ajax@redhat.com>
- *             Ray Strode <rstrode@redhat.com>
  */
 #include "config.h"
 
@@ -49,7 +46,7 @@
 #include "ply-list.h"
 #include "ply-logger.h"
 #include "ply-text-display.h"
-#include "ply-text-progress-bar.h"
+#include "ply-text-step-bar.h"
 #include "ply-utils.h"
 
 #include <linux/kd.h>
@@ -78,7 +75,7 @@ typedef struct
 {
   ply_boot_splash_plugin_t *plugin;
   ply_text_display_t *display;
-  ply_text_progress_bar_t *progress_bar;
+  ply_text_step_bar_t *step_bar;
 
 } view_t;
 
@@ -97,7 +94,7 @@ view_new (ply_boot_splash_plugin_t *plugin,
   view->plugin = plugin;
   view->display = display;
 
-  view->progress_bar = ply_text_progress_bar_new ();
+  view->step_bar = ply_text_step_bar_new ();
 
   return view;
 }
@@ -105,7 +102,7 @@ view_new (ply_boot_splash_plugin_t *plugin,
 static void
 view_free (view_t *view)
 {
-  ply_text_progress_bar_free (view->progress_bar);
+  ply_text_step_bar_free (view->step_bar);
 
   free (view);
 }
@@ -180,10 +177,10 @@ view_start_animation (view_t *view)
                                     0xffffff);
   ply_terminal_set_color_hex_value (terminal,
                                     PLY_TERMINAL_COLOR_BLUE,
-                                    0x0073B3);
+                                    0x3465a4);
   ply_terminal_set_color_hex_value (terminal,
                                     PLY_TERMINAL_COLOR_BROWN,
-                                    0x00457E);
+                                    0x979a9b);
 
   ply_text_display_set_background_color (view->display,
                                          PLY_TERMINAL_COLOR_BLACK);
@@ -192,11 +189,11 @@ view_start_animation (view_t *view)
 
   if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN)
     {
-      ply_text_progress_bar_hide (view->progress_bar);
+      ply_text_step_bar_hide (view->step_bar);
       return;
     }
 
-  ply_text_progress_bar_show (view->progress_bar,
+  ply_text_step_bar_show (view->step_bar,
                               view->display);
 }
 
@@ -452,7 +449,7 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
       view = ply_list_node_get_data (node);
       next_node = ply_list_get_next_node (plugin->views, node);
 
-      ply_text_progress_bar_hide (view->progress_bar);
+      ply_text_step_bar_hide (view->step_bar);
 
       node = next_node;
     }
@@ -571,8 +568,8 @@ on_boot_progress (ply_boot_splash_plugin_t *plugin,
       view = ply_list_node_get_data (node);
       next_node = ply_list_get_next_node (plugin->views, node);
 
-      ply_text_progress_bar_set_percent_done (view->progress_bar, percent_done);
-      ply_text_progress_bar_draw (view->progress_bar);
+      ply_text_step_bar_set_percent_done (view->step_bar, percent_done);
+      ply_text_step_bar_draw (view->step_bar);
 
       node = next_node;
     }

diff --git a/src/plugins/splash/contact/Makefile.am b/src/plugins/splash/tribar/Makefile.am
similarity index 77%
rename from src/plugins/splash/contact/Makefile.am
rename to src/plugins/splash/tribar/Makefile.am
index e356bacc7d32da7f47d5295f842cb1fba735a009..c1b3099f8f926b956d116f560ecdde54514591d9 100644 (file)
--- a/src/plugins/splash/contact/Makefile.am
+++ b/src/plugins/splash/tribar/Makefile.am
@@ -7,17 +7,17 @@ INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
 
 plugindir = $(libdir)/plymouth
-plugin_LTLIBRARIES = contact.la
+plugin_LTLIBRARIES = tribar.la
 
-contact_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                           \
+tribar_la_CFLAGS = $(PLYMOUTH_CFLAGS)                                           \
                  -DPLYMOUTH_BACKGROUND_COLOR=$(background_color)              \
                  -DPLYMOUTH_BACKGROUND_END_COLOR=$(background_end_color)      \
                  -DPLYMOUTH_BACKGROUND_START_COLOR=$(background_start_color)
 
-contact_la_LDFLAGS = -module -avoid-version -export-dynamic
-contact_la_LIBADD = $(PLYMOUTH_LIBS)                                            \
+tribar_la_LDFLAGS = -module -avoid-version -export-dynamic
+tribar_la_LIBADD = $(PLYMOUTH_LIBS)                                            \
                  ../../../libply/libply.la                                   \
                  ../../../libply-splash-core/libply-splash-core.la
-contact_la_SOURCES = $(srcdir)/plugin.c
+tribar_la_SOURCES = $(srcdir)/plugin.c
 
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/splash/contact/plugin.c b/src/plugins/splash/tribar/plugin.c
similarity index 96%
rename from src/plugins/splash/contact/plugin.c
rename to src/plugins/splash/tribar/plugin.c
index c61b7a3b3288e79c28d21d68eabf4a1e748fb8ce..4458badfe9cad8c79b50d7544f7ed882ad2dca32 100644 (file)
--- a/src/plugins/splash/contact/plugin.c
+++ b/src/plugins/splash/tribar/plugin.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2008-2012 Red Hat, Inc.
+ *
+ * Copyright (C) 2008 Red Hat, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,6 +17,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  *
+ * Written by: Adam Jackson <ajax@redhat.com>
+ *             Ray Strode <rstrode@redhat.com>
  */
 #include "config.h"
 
@@ -46,7 +49,7 @@
 #include "ply-list.h"
 #include "ply-logger.h"
 #include "ply-text-display.h"
-#include "ply-text-step-bar.h"
+#include "ply-text-progress-bar.h"
 #include "ply-utils.h"
 
 #include <linux/kd.h>
@@ -75,7 +78,7 @@ typedef struct
 {
   ply_boot_splash_plugin_t *plugin;
   ply_text_display_t *display;
-  ply_text_step_bar_t *step_bar;
+  ply_text_progress_bar_t *progress_bar;
 
 } view_t;
 
@@ -94,7 +97,7 @@ view_new (ply_boot_splash_plugin_t *plugin,
   view->plugin = plugin;
   view->display = display;
 
-  view->step_bar = ply_text_step_bar_new ();
+  view->progress_bar = ply_text_progress_bar_new ();
 
   return view;
 }
@@ -102,7 +105,7 @@ view_new (ply_boot_splash_plugin_t *plugin,
 static void
 view_free (view_t *view)
 {
-  ply_text_step_bar_free (view->step_bar);
+  ply_text_progress_bar_free (view->progress_bar);
 
   free (view);
 }
@@ -177,10 +180,10 @@ view_start_animation (view_t *view)
                                     0xffffff);
   ply_terminal_set_color_hex_value (terminal,
                                     PLY_TERMINAL_COLOR_BLUE,
-                                    0x3465a4);
+                                    0x0073B3);
   ply_terminal_set_color_hex_value (terminal,
                                     PLY_TERMINAL_COLOR_BROWN,
-                                    0x979a9b);
+                                    0x00457E);
 
   ply_text_display_set_background_color (view->display,
                                          PLY_TERMINAL_COLOR_BLACK);
@@ -189,11 +192,11 @@ view_start_animation (view_t *view)
 
   if (plugin->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN)
     {
-      ply_text_step_bar_hide (view->step_bar);
+      ply_text_progress_bar_hide (view->progress_bar);
       return;
     }
 
-  ply_text_step_bar_show (view->step_bar,
+  ply_text_progress_bar_show (view->progress_bar,
                               view->display);
 }
 
@@ -449,7 +452,7 @@ stop_animation (ply_boot_splash_plugin_t *plugin)
       view = ply_list_node_get_data (node);
       next_node = ply_list_get_next_node (plugin->views, node);
 
-      ply_text_step_bar_hide (view->step_bar);
+      ply_text_progress_bar_hide (view->progress_bar);
 
       node = next_node;
     }
@@ -568,8 +571,8 @@ on_boot_progress (ply_boot_splash_plugin_t *plugin,
       view = ply_list_node_get_data (node);
       next_node = ply_list_get_next_node (plugin->views, node);
 
-      ply_text_step_bar_set_percent_done (view->step_bar, percent_done);
-      ply_text_step_bar_draw (view->step_bar);
+      ply_text_progress_bar_set_percent_done (view->progress_bar, percent_done);
+      ply_text_progress_bar_draw (view->progress_bar);
 
       node = next_node;
     }

diff --git a/themes/Makefile.am b/themes/Makefile.am
index bb58c263c9bf4eb91f670a0fecb4734f7a1a8257..72e642bc79b4d446cebf17e3fa453a59a2e99adf 100644 (file)
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = spinfinity fade-in text details solar glow script spinner contact
+SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/themes/contact/.gitignore b/themes/contact/.gitignore
deleted file mode 100644 (file)
index e16e0b0..0000000
--- a/themes/contact/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-! contact.plymouth

diff --git a/themes/contact/Makefile.am b/themes/contact/Makefile.am
deleted file mode 100644 (file)
index 70fefdc..0000000
--- a/themes/contact/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-themedir = $(datadir)/plymouth/themes/contact
-dist_theme_DATA = contact.plymouth
-
-MAINTAINERCLEANFILES = Makefile.in

diff --git a/themes/contact/contact.plymouth b/themes/contact/contact.plymouth
deleted file mode 100644 (file)
index 462ffbb..0000000
--- a/themes/contact/contact.plymouth
+++ /dev/null
@@ -1,4 +0,0 @@
-[Plymouth Theme]
-Name=Contact
-Description=Text mode theme with a 3 box countdown
-ModuleName=contact

diff --git a/themes/text/.gitignore b/themes/text/.gitignore
index 971da40372aa72cb40ab491fa53aff3a2a65b75e..e16e0b08ff588471b75d6b85749bf1800ff66c89 100644 (file)
--- a/themes/text/.gitignore
+++ b/themes/text/.gitignore
@@ -1 +1 @@
-! text.plymouth
+! contact.plymouth

diff --git a/themes/text/text.plymouth b/themes/text/text.plymouth
index a2db9e683da3c9e8bd5f2231711c27f4f8a1a5ef..126eb0955caceebd09a783ce542c2d96f6775154 100644 (file)
--- a/themes/text/text.plymouth
+++ b/themes/text/text.plymouth
@@ -1,4 +1,4 @@
 [Plymouth Theme]
 Name=Text
-Description=Text mode theme with tricolor progress bar
+Description=Text mode theme with a 3 box countdown
 ModuleName=text

diff --git a/themes/tribar/.gitignore b/themes/tribar/.gitignore
new file mode 100644 (file)
index 0000000..971da40
--- /dev/null
+++ b/themes/tribar/.gitignore
@@ -0,0 +1 @@
+! text.plymouth

diff --git a/themes/tribar/Makefile.am b/themes/tribar/Makefile.am
new file mode 100644 (file)
index 0000000..3066d2f
--- /dev/null
+++ b/themes/tribar/Makefile.am
@@ -0,0 +1,4 @@
+themedir = $(datadir)/plymouth/themes/tribar
+dist_theme_DATA = tribar.plymouth
+
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/themes/tribar/tribar.plymouth b/themes/tribar/tribar.plymouth
new file mode 100644 (file)
index 0000000..6db7b4e
--- /dev/null
+++ b/themes/tribar/tribar.plymouth
@@ -0,0 +1,4 @@
+[Plymouth Theme]
+Name=Tribar
+Description=Text mode theme with tricolor progress bar
+ModuleName=tribar