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

isReachable/isPaired as properties, correct icon #40

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

isReachable/isPaired as properties, correct icon #40

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
56 changes: 15 additions & 41 deletions src/Device.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace KDEConnectIndicator {
}
public string icon_name {
get {
Variant return_variant=device_proxy.get_cached_property ("iconName");
Variant return_variant=device_proxy.get_cached_property ("statusIconName");
if (return_variant!=null && return_variant.get_string () != "")
return return_variant.get_string ();
return "smartphone"; // default to smartphone as KDC 0.5 doens't have icon name props
Expand Down Expand Up @@ -222,47 +222,21 @@ namespace KDEConnectIndicator {
message (e.message);
}
}
public bool is_paired () {
try {
var return_variant = conn.call_sync (
"org.kde.kdeconnect",
path,
"org.kde.kdeconnect.device",
"isPaired",
null,
null,
DBusCallFlags.NONE,
-1,
null
);
Variant i = return_variant.get_child_value (0);
if (i!=null)
return i.get_boolean ();
} catch (Error e) {
message (e.message);
}
return false;
public bool is_paired {
get {
Variant return_variant=device_proxy.get_cached_property ("isPaired");
if (return_variant!=null)
return return_variant.get_boolean ();
return false; // default to false if something went wrong
}
}
public bool is_reachable () {
try {
var return_variant = conn.call_sync (
"org.kde.kdeconnect",
path,
"org.kde.kdeconnect.device",
"isReachable",
null,
null,
DBusCallFlags.NONE,
-1,
null
);
Variant i = return_variant.get_child_value (0);
if (i!=null)
return i.get_boolean ();
} catch (Error e) {
message (e.message);
}
return false;
public bool is_reachable {
get {
Variant return_variant=device_proxy.get_cached_property ("isReachable");
if (return_variant!=null)
return return_variant.get_boolean ();
return false; // default to false if something went wrong
}
}
public bool is_charging () {
if (!has_plugin ("kdeconnect_battery"))
Expand Down
18 changes: 9 additions & 9 deletions src/DeviceIndicator.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace KDEConnectIndicator {

indicator = new AppIndicator.Indicator (
path,
device.icon_name + "-symbolic",
device.icon_name,
AppIndicator.IndicatorCategory.HARDWARE);

name_item = new Gtk.MenuItem ();
Expand Down Expand Up @@ -120,7 +120,7 @@ namespace KDEConnectIndicator {
}

private void update_visibility () {
if (!device.is_reachable ())
if (!device.is_reachable)
indicator.set_status (AppIndicator.IndicatorStatus.PASSIVE);
else
indicator.set_status (AppIndicator.IndicatorStatus.ACTIVE);
Expand All @@ -129,31 +129,31 @@ namespace KDEConnectIndicator {
name_item.label = device.name;
}
private void update_battery_item () {
battery_item.visible = device.is_paired ()
&& device.is_reachable ()
battery_item.visible = device.is_paired
&& device.is_reachable
&& device.has_plugin ("kdeconnect_battery");
this.battery_item.label = "Battery : %d%%".printf(device.battery);
if (device.is_charging ())
this.battery_item.label += " (charging)";
}
private void update_status_item () {

if (device.is_reachable ()) {
if (device.is_paired ())
if (device.is_reachable) {
if (device.is_paired)
this.status_item.label = "Device Reachable and Paired";
else
this.status_item.label = "Device Reachable but Not Paired";
} else {
if (device.is_paired ())
if (device.is_paired)
this.status_item.label = "Device Paired but not Reachable";
else
// is this even posible?
this.status_item.label = "Device Not Reachable and Not Paired";
}
}
private void update_pair_item () {
var paired = device.is_paired ();
var reachable = device.is_reachable ();
var paired = device.is_paired;
var reachable = device.is_reachable;
pair_item.visible = !paired;
unpair_item.visible = paired;

Expand Down
2 changes: 1 addition & 1 deletion src/contractor/Contractor.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ namespace KDEConnectIndicator {
var device_list = new SList<Device> ();
foreach (string id in id_list) {
var d = new Device ("/modules/kdeconnect/devices/"+id);
if (d.is_reachable () && d.is_paired ()) {
if (d.is_reachable && d.is_paired) {
device_list.append (d);
Gtk.TreeIter iter;
list_store.append (out iter);
Expand Down