fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-08 20:38:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make contact the default text plugin

Browse source 
And rename the old text plugin "tribar"

https://bugs.freedesktop.org/show_bug.cgi?id=55286
This commit is contained in:
William Jon McCann 2012-10-01 16:16:03 -04:00 • committed by Ray Strode
parent 4a824ff649
commit 7f83a660c9
14 changed files with 48 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -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

2
src/plugins/splash/Makefile.am
View file

@ -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

29
src/plugins/splash/text/plugin.c
View file

@ -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;
}

10
src/plugins/splash/contact/Makefile.am → src/plugins/splash/tribar/Makefile.am
View file

@ -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

27
src/plugins/splash/contact/plugin.c → src/plugins/splash/tribar/plugin.c
View file

@ -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;
}

2
themes/Makefile.am
View file

@ -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

1
themes/contact/.gitignore vendored
View file

@ -1 +0,0 @@
! contact.plymouth

4
themes/contact/Makefile.am
View file

@ -1,4 +0,0 @@
themedir = $(datadir)/plymouth/themes/contact
dist_theme_DATA = contact.plymouth
MAINTAINERCLEANFILES = Makefile.in

4
themes/contact/contact.plymouth
View file

@ -1,4 +0,0 @@
[Plymouth Theme]
Name=Contact
Description=Text mode theme with a 3 box countdown
ModuleName=contact

2
themes/text/.gitignore vendored
View file

@ -1 +1 @@
! text.plymouth
! contact.plymouth

2
themes/text/text.plymouth
View file

@ -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

1
themes/tribar/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
! text.plymouth

4
themes/tribar/Makefile.am Normal file
View file

@ -0,0 +1,4 @@
themedir = $(datadir)/plymouth/themes/tribar
dist_theme_DATA = tribar.plymouth
MAINTAINERCLEANFILES = Makefile.in

4
themes/tribar/tribar.plymouth Normal file
View file

@ -0,0 +1,4 @@
[Plymouth Theme]
Name=Tribar
Description=Text mode theme with tricolor progress bar
ModuleName=tribar