cromer/tuf-manager
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

change warning method

Browse Source
This commit is contained in:
Chris Cromer
2020-08-07 01:15:27 -04:00
parent bc9f3c3c49
commit 130a131214
10 changed files with 163 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/cli.vala
View File

@@ -183,7 +183,7 @@ namespace TUFManager {
connect_tuf_server ();
}
catch (TUFError e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
this.release ();
return 1;
}
@@ -292,7 +292,7 @@ namespace TUFManager {
}
}
catch (RegexError e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
}
finally {
rgba = Gdk.RGBA ();
@@ -319,7 +319,7 @@ namespace TUFManager {
}
if (invalid) {
command_line.printerr (_ ("Invalid arguments!\n\n"));
warning (_ ("Invalid arguments!"));
print_usage (command_line);
release_cli ();
return 1;
@@ -349,7 +349,7 @@ namespace TUFManager {
command_line.print (_ ("Current fan mode: ") + _ ("Silent\n"));
break;
default:
command_line.printerr (_ ("Error: ") + _ ("Could not get current fan mode!\n"));
warning (_ ("Could not get current fan mode!"));
break;
}
current_setting = get_keyboard_mode ();
@@ -367,7 +367,7 @@ namespace TUFManager {
command_line.print (_ ("Current keyboard lighting: ") + _ ("Strobing\n"));
break;
default:
command_line.printerr (_ ("Error: ") + _ ("Could not get current keyboard mode!\n"));
warning (_ ("Could not get current keyboard mode!"));
break;
}
current_setting = get_keyboard_speed ();
@@ -382,7 +382,7 @@ namespace TUFManager {
command_line.print (_ ("Current keyboard speed: ") + _ ("Fast\n"));
break;
default:
command_line.printerr (_ ("Error: ") + _ ("Could not get current keyboard speed!\n"));
warning (_ ("Could not get current keyboard speed!"));
break;
}
var current_color = get_keyboard_color ();
@@ -413,7 +413,7 @@ namespace TUFManager {
});
}
catch (Error e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
}
#endif
@@ -438,7 +438,7 @@ namespace TUFManager {
});
}
catch (Error e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
}
#endif
return 0;
@@ -462,7 +462,7 @@ namespace TUFManager {
});
}
catch (Error e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
}
#endif
return 0;
@@ -484,7 +484,7 @@ namespace TUFManager {
});
}
catch (Error e) {
command_line.printerr (_ ("Error: ") + e.message + "\n");
warning (e.message);
}
#endif
return 0;

36
src/common.vala
View File

@@ -38,7 +38,7 @@ namespace TUFManager {
tuf_server = Bus.get_proxy_sync (BusType.SYSTEM, "org.tuf.manager.server", "/org/tuf/manager/server");
}
catch (IOError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
string? server_version = get_server_version ();
@@ -61,7 +61,7 @@ namespace TUFManager {
return tuf_server.get_server_version ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return null;
}
@@ -76,10 +76,10 @@ namespace TUFManager {
return tuf_server.get_fan_mode ();
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return -3;
}
@@ -94,10 +94,10 @@ namespace TUFManager {
tuf_server.set_fan_mode (mode, bus_name);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -111,10 +111,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_color ();
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return Gdk.RGBA ();
}
@@ -129,10 +129,10 @@ namespace TUFManager {
tuf_server.set_keyboard_color (color, bus_name);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -146,10 +146,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_mode ();
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return -3;
}
@@ -164,10 +164,10 @@ namespace TUFManager {
tuf_server.set_keyboard_mode (mode, bus_name);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -181,10 +181,10 @@ namespace TUFManager {
return tuf_server.get_keyboard_speed ();
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return -3;
}
@@ -199,10 +199,10 @@ namespace TUFManager {
tuf_server.set_keyboard_speed (speed, bus_name);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
}

8
src/gui-window.vala
View File

@@ -76,7 +76,7 @@ namespace TUFManager {
connect_tuf_server ();
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
if (e.code == TUFError.UNMATCHED_VERSIONS) {
Gtk.MessageDialog msg;
msg = new Gtk.MessageDialog (this,
@@ -106,7 +106,7 @@ namespace TUFManager {
print (_ ("Current fan mode: ") + fan_mode.get_active_text () + "\n");
}
else {
stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current fan mode!"));
warning (_ ("Could not get current fan mode!"));
}
// Get the keyboard mode
@@ -122,7 +122,7 @@ namespace TUFManager {
print (_ ("Current keyboard mode: ") + keyboard_mode.get_active_text () + "\n");
}
else {
stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current keyboard mode!"));
warning (_ ("Could not get current keyboard mode!"));
}
// Get the keyboard speed
@@ -132,7 +132,7 @@ namespace TUFManager {
print (_ ("Current keyboard speed: ") + keyboard_speed.get_active_text () + "\n");
}
else {
stderr.printf ("%s\n", _ ("Error: ") + _ ("Could not get current keyboard speed!"));
warning (_ ("Could not get current keyboard speed!"));
}
// Get the keyboard color

4
src/main.vala.in
View File

@@ -28,10 +28,10 @@ namespace TUFManager {
application.register ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (application.get_is_remote ()) {
stderr.printf (_ ("Error: ") + _ ("Another instance of TUF Manager is already running!\n"));
warning (_ ("Another instance of TUF Manager is already running!"));
return -1;
}
return application.run (args);

8
src/server-main.vala
View File

@@ -65,7 +65,7 @@ namespace TUFManager {
opt_context.parse (ref args);
}
catch (OptionError e) {
print (_ ("Error: %s\n"), e.message);
warning (e.message);
print (_ ("Run '%s --help' to see a full list of available command line options.\n"), args[0]);
return 1;
}
@@ -85,11 +85,11 @@ namespace TUFManager {
file = null;
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
var stream = FileStream.open ("/run/tufmanager/pid", "w");
if (stream == null) {
stderr.printf (_ ("Error: ") + _ ("Could not create pid file!\n"));
warning (_ ("Could not create pid file!"));
}
else {
uint32 pidfile = pid;
@@ -119,7 +119,7 @@ namespace TUFManager {
on_bus_acquired,
() => {},
() => {
stderr.printf (_ ("Error: ") + _ ("Could not acquire bus name!\n"));
warning (_ ("Could not acquire bus name!"));
});
loop = new MainLoop ();

38
src/server.vala
View File

@@ -41,13 +41,13 @@ namespace TUFManager {
tuf_server = new TUFManager.Server.TUFServer ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
try {
conn.register_object ("/org/tuf/manager/server", tuf_server);
}
catch (IOError e) {
stderr.printf (_ ("Error: ") + _ ("Could not register service!\n"));
warning (_ ("Could not register service!"));
if (loop != null) {
loop.quit ();
}
@@ -137,7 +137,7 @@ namespace TUFManager {
authorized = result.get_is_authorized ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
return authorized;
#endif
@@ -198,10 +198,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (authorized) {
@@ -209,10 +209,10 @@ namespace TUFManager {
set_fan_mode_authorized (mode, sender);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
else {
@@ -318,10 +318,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (authorized) {
@@ -329,10 +329,10 @@ namespace TUFManager {
set_keyboard_color_authorized (color, sender);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
else {
@@ -444,10 +444,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (authorized) {
@@ -455,10 +455,10 @@ namespace TUFManager {
set_keyboard_mode_authorized (mode, sender);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
else {
@@ -556,10 +556,10 @@ namespace TUFManager {
authorized = get_authorization.end (res);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (authorized) {
@@ -567,10 +567,10 @@ namespace TUFManager {
set_keyboard_speed_authorized (speed, sender);
}
catch (TUFError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
else {

10
src/tray-icon.vala
View File

@@ -46,7 +46,7 @@ namespace TUFManager {
indicator.set_title (_ ("TUF Manager"));
set_icon_visible (true);
Timeout.add (200, () => {
Timeout.add_seconds (30, () => {
indicator.set_status (AppIndicator.IndicatorStatus.ACTIVE);
return false;
});
@@ -62,7 +62,7 @@ namespace TUFManager {
Process.spawn_command_line_async ("tuf-gui");
}
catch (SpawnError e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -84,7 +84,7 @@ namespace TUFManager {
notification.show ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -101,7 +101,7 @@ namespace TUFManager {
}
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}
@@ -113,7 +113,7 @@ namespace TUFManager {
}
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
}

4
src/tray-main.vala
View File

@@ -33,10 +33,10 @@ namespace TUFManager {
application.register ();
}
catch (Error e) {
stderr.printf (_ ("Error: %s\n"), e.message);
warning (e.message);
}
if (application.get_is_remote ()) {
stderr.printf (_ ("Error: ") + _ ("Another instance of TUF Manager is already running!\n"));
warning (_ ("Another instance of TUF Manager is already running!"));
return -1;
}
return application.run ();