~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to src/program.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Terry
  • Date: 2009-05-12 09:26:46 UTC
  • mfrom: (1.2.11 upstream) (2.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090512092646-j8lb1w2x69pvgma4
Tags: 7.18.1-1ubuntu1
* Merge from debian unstable (LP: #375435), remaining changes:
  - debian/control: Also Recommend abrowser

Show diffs side-by-side

added added

removed removed

Lines of Context:
66
66
}
67
67
 
68
68
static void
69
 
program_info( Program *program, BufInfo *buf )
 
69
program_info( Program *program, VipsBuf *buf )
70
70
{
71
71
        Model *model = program_get_selected( program );
72
72
 
73
 
        buf_appendf( buf, _( "Edit window" ) );
74
 
        buf_appendf( buf, "\n" );
75
 
        buf_appendf( buf, "dirty = \"%s\"\n", bool_to_char( program->dirty ) );
76
 
        buf_appendf( buf, "\n" );
 
73
        vips_buf_appendf( buf, _( "Edit window" ) );
 
74
        vips_buf_appendf( buf, "\n" );
 
75
        vips_buf_appendf( buf, "dirty = \"%s\"\n", bool_to_char( program->dirty ) );
 
76
        vips_buf_appendf( buf, "\n" );
77
77
 
78
78
        if( model ) {
79
79
                iobject_info( IOBJECT( model ), buf );
80
 
                buf_appendf( buf, "\n" );
 
80
                vips_buf_appendf( buf, "\n" );
81
81
        }
82
82
}
83
83
 
247
247
static void
248
248
program_title( Program *program )
249
249
{
250
 
        BufInfo buf;
 
250
        VipsBuf buf;
251
251
        char txt[512];
252
252
 
253
 
        buf_init_static( &buf, txt, 512 );
254
 
        buf_appendf( &buf, IOBJECT( program->kitg )->name );
255
 
        if( program->kit ) {
256
 
                buf_appendf( &buf, " - %s", IOBJECT( program->kit )->name );
257
 
 
258
 
                if( FILEMODEL( program->kit )->modified ) {
259
 
                        buf_appendf( &buf, " [" );
260
 
                        buf_appendf( &buf, _( "modified" ) );
261
 
                        buf_appendf( &buf, "]" );
262
 
                }
263
 
        }
 
253
        vips_buf_init_static( &buf, txt, 512 );
 
254
        if( program->kit && FILEMODEL( program->kit )->modified ) 
 
255
                vips_buf_appendf( &buf, "*" ); 
 
256
        vips_buf_appends( &buf, IOBJECT( program->kitg )->name );
 
257
        if( program->kit ) 
 
258
                vips_buf_appendf( &buf, " - %s", IOBJECT( program->kit )->name );
264
259
        if( program->tool ) {
265
 
                buf_appendf( &buf, " - %s", IOBJECT( program->tool )->name );
 
260
                vips_buf_appendf( &buf, " - %s", IOBJECT( program->tool )->name );
266
261
 
267
262
                if( program->dirty ) {
268
 
                        buf_appendf( &buf, " [" );
269
 
                        buf_appendf( &buf, _( "modified" ) );
270
 
                        buf_appendf( &buf, "]" );
 
263
                        vips_buf_appendf( &buf, " [" );
 
264
                        vips_buf_appendf( &buf, _( "modified" ) );
 
265
                        vips_buf_appendf( &buf, "]" );
271
266
                }
272
267
        }
273
268
 
274
 
        iwindow_set_title( IWINDOW( program ), buf_all( &buf ) );
 
269
        iwindow_set_title( IWINDOW( program ), "%s", vips_buf_all( &buf ) );
275
270
}
276
271
 
277
272
typedef struct _ProgramRowLookupInfo {
617
612
                return;
618
613
        }
619
614
 
620
 
        nfn( sys, IWINDOW_TRUE );
 
615
        nfn( sys, IWINDOW_YES );
621
616
}
622
617
 
623
618
static void
625
620
{
626
621
        GtkWidget *ss = stringset_new();
627
622
 
628
 
        assert( tool->type == TOOL_DIA );
 
623
        g_assert( tool->type == TOOL_DIA );
629
624
 
630
625
        stringset_child_new( STRINGSET( ss ), 
631
626
                _( "Name" ), IOBJECT( tool )->name, _( "Menu item text" ) );
830
825
        printf( "program_kit_destroy:\n" );
831
826
#endif /*DEBUG*/
832
827
 
833
 
        assert( program->kit == kit );
 
828
        g_assert( program->kit == kit );
834
829
 
835
830
        program_detach( program );
836
831
        program_refresh( program );
856
851
program_set_text_tool( Program *program, Tool *tool )
857
852
{
858
853
        char str[MAX_STRSIZE];
859
 
        BufInfo buf;
 
854
        VipsBuf buf;
860
855
 
861
856
        switch( tool->type ) {
862
857
        case TOOL_DIA:
867
862
        case TOOL_SYM:
868
863
                switch( tool->sym->type ) {
869
864
                case SYM_EXTERNAL:
870
 
                        buf_init_static( &buf, str, MAX_STRSIZE );
 
865
                        vips_buf_init_static( &buf, str, MAX_STRSIZE );
871
866
                        vips_usage( &buf, tool->sym->function );
872
 
                        program_set_text( program, buf_all( &buf ), FALSE );
 
867
                        program_set_text( program, vips_buf_all( &buf ), FALSE );
873
868
                        break;
874
869
 
875
870
                case SYM_BUILTIN:
876
 
                        buf_init_static( &buf, str, MAX_STRSIZE );
 
871
                        vips_buf_init_static( &buf, str, MAX_STRSIZE );
877
872
                        builtin_usage( &buf, tool->sym->builtin );
878
 
                        program_set_text( program, buf_all( &buf ), FALSE );
 
873
                        program_set_text( program, vips_buf_all( &buf ), FALSE );
879
874
                        break;
880
875
 
881
876
                case SYM_VALUE:
884
879
                        break;
885
880
                
886
881
                default:
887
 
                        assert( FALSE );
 
882
                        g_assert( FALSE );
888
883
                }
889
884
                break;
890
885
 
891
886
        default:
892
 
                assert( FALSE );
 
887
                g_assert( FALSE );
893
888
        }
894
889
}
895
890
 
902
897
        printf( "program_tool_destroy:\n" );
903
898
#endif /*DEBUG*/
904
899
 
905
 
        assert( program->tool == tool );
 
900
        g_assert( program->tool == tool );
906
901
 
907
902
        program_detach( program );
908
903
        program_set_text( program, "", TRUE );
1058
1053
        Program *program = PROGRAM( client );
1059
1054
 
1060
1055
        Toolkit *kit;
1061
 
        BufInfo buf;
 
1056
        VipsBuf buf;
1062
1057
        char str[1024];
1063
1058
        char name_text[1024];
1064
1059
        char caption_text[1024];
1071
1066
 
1072
1067
        /* Make a filename from the name ... user start directory.
1073
1068
         */
1074
 
        buf_init_static( &buf, str, 1024 );
1075
 
        buf_appendf( &buf, "$SAVEDIR" G_DIR_SEPARATOR_S 
 
1069
        vips_buf_init_static( &buf, str, 1024 );
 
1070
        vips_buf_appendf( &buf, "$SAVEDIR" G_DIR_SEPARATOR_S 
1076
1071
                "start" G_DIR_SEPARATOR_S "%s.def", 
1077
1072
                name_text );
1078
 
        kit = toolkit_new_filename( main_toolkitgroup, buf_all( &buf ) );
 
1073
        kit = toolkit_new_filename( main_toolkitgroup, vips_buf_all( &buf ) );
1079
1074
 
1080
1075
        /* Set caption.
1081
1076
         */
1086
1081
 
1087
1082
        program_select_kit( program, kit );
1088
1083
 
1089
 
        nfn( sys, IWINDOW_TRUE );
 
1084
        nfn( sys, IWINDOW_YES );
1090
1085
}
1091
1086
 
1092
1087
static void
1160
1155
        tool = tool_new_dia( program->kit, pos + 1, name_text, file_text );
1161
1156
        program_select_tool( program, tool );
1162
1157
 
1163
 
        nfn( sys, IWINDOW_TRUE );
 
1158
        nfn( sys, IWINDOW_YES );
1164
1159
}
1165
1160
 
1166
1161
static void
1235
1230
 
1236
1231
        symbol_recalculate_all();
1237
1232
 
1238
 
        nfn( sys, IWINDOW_TRUE );
 
1233
        nfn( sys, IWINDOW_YES );
1239
1234
}
1240
1235
 
1241
1236
static void
1286
1281
        main_reload();
1287
1282
        symbol_recalculate_all();
1288
1283
 
1289
 
        nfn( sys, IWINDOW_TRUE );
 
1284
        nfn( sys, IWINDOW_YES );
1290
1285
}
1291
1286
 
1292
1287
/* Reload all menus.
1447
1442
                return;
1448
1443
        }
1449
1444
 
1450
 
        nfn( sys, IWINDOW_TRUE );
 
1445
        nfn( sys, IWINDOW_YES );
1451
1446
}
1452
1447
 
1453
1448
static void
1532
1527
                return;
1533
1528
        }
1534
1529
 
1535
 
        nfn( sys, IWINDOW_TRUE );
 
1530
        nfn( sys, IWINDOW_YES );
1536
1531
}
1537
1532
 
1538
1533
static void
1570
1565
static void
1571
1566
program_info_action_cb( GtkAction *action, Program *program )
1572
1567
{
1573
 
        BufInfo buf;
 
1568
        VipsBuf buf;
1574
1569
        char txt[MAX_STRSIZE];
1575
1570
 
1576
 
        buf_init_static( &buf, txt, MAX_STRSIZE );
 
1571
        vips_buf_init_static( &buf, txt, MAX_STRSIZE );
1577
1572
        program_info( program, &buf );
1578
1573
        box_info( GTK_WIDGET( program ), _( "Object information." ), 
1579
 
                "%s", buf_all( &buf ) );
 
1574
                "%s", vips_buf_all( &buf ) );
1580
1575
}
1581
1576
 
1582
1577
static void
1603
1598
static void
1604
1599
program_tool_help_action_cb( GtkAction *action, Program *program )
1605
1600
{
1606
 
        BufInfo buf;
 
1601
        VipsBuf buf;
1607
1602
        char txt[512];
1608
1603
 
1609
 
        buf_init_static( &buf, txt, 512 );
 
1604
        vips_buf_init_static( &buf, txt, 512 );
1610
1605
 
1611
1606
        if( program->tool && program->tool->type == TOOL_SYM && 
1612
1607
                program->kit && program->kit->pseudo ) {
1613
1608
                switch( program->tool->sym->type ) {
1614
1609
                case SYM_EXTERNAL:
1615
 
                        buf_appendf( &buf, "file://"
 
1610
                        vips_buf_appendf( &buf, "file://"
1616
1611
                                VIPS_DOCPATH "/man/%s.3.html", 
1617
1612
                                IOBJECT( program->tool->sym )->name );
1618
 
                        box_url( GTK_WIDGET( program ), buf_all( &buf ) );
 
1613
                        box_url( GTK_WIDGET( program ), vips_buf_all( &buf ) );
1619
1614
                        break;
1620
1615
 
1621
1616
                case SYM_BUILTIN:
2265
2260
        if( program->dirty && !program_parse( program ) )
2266
2261
                nfn( sys, IWINDOW_ERROR );
2267
2262
        else
2268
 
                nfn( sys, IWINDOW_TRUE );
 
2263
                nfn( sys, IWINDOW_YES );
2269
2264
}
2270
2265
 
2271
2266
static void