← Back to branch summary

~noskcaj/ubuntu/vivid/xfce4-diskperf-plugin/2.5.5

« back to all changes in this revision

Viewing changes to panel-plugin/main.c

  • Committer: Package Import Robot
  • Author(s): Yves-Alexis Perez
  • Date: 2012-06-30 15:21:33 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20120630152133-5ypg6bb4nyfoo980
Tags: 2.5.4-1
* New upstream release.
* debian/patches:
  - 0001-Use-double-values-for-progress-bars-bug-8882 dropped, included
    upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel-plugin/main.c
387
387
    Widget_t       *pwBar;
388
388
    int             i;
389
389
 
390
 
    if (p_iOrientation == GTK_ORIENTATION_HORIZONTAL)
391
 
        poMonitor->wBox = gtk_hbox_new (FALSE, 0);
392
 
    else
393
 
        poMonitor->wBox = gtk_vbox_new (FALSE, 0);
 
390
    poMonitor->wBox = xfce_hvbox_new (p_iOrientation, FALSE, 0);
394
391
    gtk_widget_show (poMonitor->wBox);
395
 
    gtk_container_set_border_width (GTK_CONTAINER
396
 
                                    (poMonitor->wBox), 4);
397
392
 
398
393
    gtk_container_add (GTK_CONTAINER (poMonitor->wEventBox),
399
394
                       poMonitor->wBox);
402
397
    if (poConf->fTitleDisplayed)
403
398
        gtk_widget_show (poMonitor->wTitle);
404
399
    gtk_box_pack_start (GTK_BOX (poMonitor->wBox),
405
 
                        GTK_WIDGET (poMonitor->wTitle), FALSE, FALSE, 0);
 
400
                        GTK_WIDGET (poMonitor->wTitle), FALSE, FALSE, 2);
406
401
 
407
402
    for (i = 0; i < 2; i++) {
408
403
        pwBar = poMonitor->awProgressBar + i;
474
469
    poPlugin->oMonitor.oPrevPerf.timestamp_ns = 0;
475
470
 
476
471
    poMonitor->wEventBox = gtk_event_box_new ();
 
472
    gtk_event_box_set_visible_window(GTK_EVENT_BOX(poMonitor->wEventBox), FALSE);
 
473
    gtk_event_box_set_above_child(GTK_EVENT_BOX(poMonitor->wEventBox), TRUE);
477
474
    gtk_widget_show (poMonitor->wEventBox);
478
475
 
479
476
    xfce_panel_plugin_add_action_widget (plugin, poMonitor->wEventBox);
1093
1090
{
1094
1091
    int             i, size1, size2;
1095
1092
    Widget_t       *pwBar;
 
1093
    struct monitor_t *poMonitor = &(poPlugin->oMonitor);
1096
1094
 
1097
 
    TRACE ("diskperf_set_size()\n");
 
1095
    TRACE ("diskperf_set_size(%d)\n", p_size);
 
1096
    gtk_container_set_border_width (GTK_CONTAINER
 
1097
                                    (poMonitor->wBox), p_size > 26 ? 2 : 1);
1098
1098
    if (xfce_panel_plugin_get_orientation (plugin) == 
1099
1099
            GTK_ORIENTATION_HORIZONTAL) {
1100
 
        size1 = BORDER;
 
1100
        size1 = 8;
1101
1101
        size2 = -1;
1102
1102
        gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, p_size);
1103
1103
    }
1104
1104
    else {
1105
1105
        size1 = -1;
1106
 
        size2 = BORDER;
 
1106
        size2 = 8;
1107
1107
        gtk_widget_set_size_request (GTK_WIDGET (plugin), p_size, -1);
1108
1108
    }
1109
1109
    for (i = 0; i < 2; i++) {