~ubuntu-branches/ubuntu/trusty/bluefish/trusty

« back to all changes in this revision

Viewing changes to src/plugin_htmlbar/htmlbar_uimanager.c

  • Committer: Package Import Robot
  • Author(s): Daniel Leidert
  • Date: 2012-06-27 22:28:39 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20120627222839-5g0f5s6gpaezfhve
Tags: 2.2.3-1
* New upstream release.
* debian/control: Dropped DM-Upload-Allowed.
  (Maintainer): Set to my new address.
  (Suggests): Calculate browsers depending on distribution.
  (Depends): Added python depends for newly shipped Python scripts.
* debian/copyright: Minor update. Link to GPLv2 text.
* debian/rules: Enabled hardening. Added python2 module. Calculate brwoser
  dependencies via dpkg-vendor.
* debian/patches/LP810663_blacklist_from_appmenu.patch: Adjusted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
94
94
}
95
95
 
96
96
static void
 
97
htmlbar_dialog_columns(GtkAction * action, gpointer user_data)
 
98
{
 
99
        columns_dialog(BFWIN(user_data), NULL);
 
100
}
 
101
 
 
102
static void
97
103
htmlbar_dialog_email(GtkAction * action, gpointer user_data)
98
104
{
99
105
        email_dialog(BFWIN(user_data), NULL);
786
792
}
787
793
 
788
794
static void
789
 
htmlbar_insert_acute(GtkAction * action, gpointer user_data)
790
 
{
791
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_ACUTE);
792
 
}
793
 
 
794
 
static void
795
 
htmlbar_insert_cedilla(GtkAction * action, gpointer user_data)
796
 
{
797
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_CEDILLA);
798
 
}
799
 
 
800
 
static void
801
 
htmlbar_insert_umlaut(GtkAction * action, gpointer user_data)
802
 
{
803
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_UMLAUT);
804
 
}
805
 
 
806
 
static void
807
 
htmlbar_insert_aacute(GtkAction * action, gpointer user_data)
808
 
{
809
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
810
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_ACUTE_UPPER);
811
 
        else
812
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_ACUTE_LOWER);
813
 
}
814
 
 
815
 
static void
816
 
htmlbar_insert_acirc(GtkAction * action, gpointer user_data)
817
 
{
818
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
819
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_CIRC_UPPER);
820
 
        else
821
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_CIRC_LOWER);
822
 
}
823
 
 
824
 
static void
825
 
htmlbar_insert_aelig(GtkAction * action, gpointer user_data)
826
 
{
827
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
828
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_ELIG_UPPER);
829
 
        else
830
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_ELIG_LOWER);
831
 
}
832
 
 
833
 
static void
834
 
htmlbar_insert_agrave(GtkAction * action, gpointer user_data)
835
 
{
836
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
837
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_GRAVE_UPPER);
838
 
        else
839
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_GRAVE_LOWER);
840
 
}
841
 
 
842
 
static void
843
 
htmlbar_insert_aring(GtkAction * action, gpointer user_data)
844
 
{
845
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
846
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_RING_UPPER);
847
 
        else
848
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_RING_LOWER);
849
 
}
850
 
 
851
 
static void
852
 
htmlbar_insert_atilde(GtkAction * action, gpointer user_data)
853
 
{
854
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
855
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_TILDE_UPPER);
856
 
        else
857
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_TILDE_LOWER);
858
 
}
859
 
 
860
 
static void
861
 
htmlbar_insert_auml(GtkAction * action, gpointer user_data)
862
 
{
863
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
864
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_UML_UPPER);
865
 
        else
866
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_A_UML_LOWER);
867
 
}
868
 
 
869
 
static void
870
 
htmlbar_insert_ccedil(GtkAction * action, gpointer user_data)
871
 
{
872
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
873
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_C_CEDIL_UPPER);
874
 
        else
875
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_C_CEDIL_LOWER);
876
 
}
877
 
 
878
 
static void
879
 
htmlbar_insert_eacute(GtkAction * action, gpointer user_data)
880
 
{
881
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
882
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_ACUTE_UPPER);
883
 
        else
884
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_ACUTE_LOWER);
885
 
}
886
 
 
887
 
static void
888
 
htmlbar_insert_ecirc(GtkAction * action, gpointer user_data)
889
 
{
890
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
891
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_CIRC_UPPER);
892
 
        else
893
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_CIRC_LOWER);
894
 
}
895
 
 
896
 
static void
897
 
htmlbar_insert_egrave(GtkAction * action, gpointer user_data)
898
 
{
899
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
900
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_GRAVE_UPPER);
901
 
        else
902
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_GRAVE_LOWER);
903
 
}
904
 
 
905
 
static void
906
 
htmlbar_insert_euml(GtkAction * action, gpointer user_data)
907
 
{
908
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
909
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_UML_UPPER);
910
 
        else
911
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_E_UML_LOWER);
912
 
}
913
 
 
914
 
static void
915
 
htmlbar_insert_iacute(GtkAction * action, gpointer user_data)
916
 
{
917
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
918
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_ACUTE_UPPER);
919
 
        else
920
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_ACUTE_LOWER);
921
 
}
922
 
 
923
 
static void
924
 
htmlbar_insert_icirc(GtkAction * action, gpointer user_data)
925
 
{
926
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
927
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_CIRC_UPPER);
928
 
        else
929
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_CIRC_LOWER);
930
 
}
931
 
 
932
 
static void
933
 
htmlbar_insert_igrave(GtkAction * action, gpointer user_data)
934
 
{
935
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
936
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_GRAVE_UPPER);
937
 
        else
938
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_GRAVE_LOWER);
939
 
}
940
 
 
941
 
static void
942
 
htmlbar_insert_iuml(GtkAction * action, gpointer user_data)
943
 
{
944
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
945
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_UML_UPPER);
946
 
        else
947
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_I_UML_LOWER);
948
 
}
949
 
 
950
 
static void
951
 
htmlbar_insert_ntilde(GtkAction * action, gpointer user_data)
952
 
{
953
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
954
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_N_TILDE_UPPER);
955
 
        else
956
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_N_TILDE_LOWER);
957
 
}
958
 
 
959
 
static void
960
 
htmlbar_insert_oacute(GtkAction * action, gpointer user_data)
961
 
{
962
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
963
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_ACUTE_UPPER);
964
 
        else
965
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_ACUTE_LOWER);
966
 
}
967
 
 
968
 
static void
969
 
htmlbar_insert_ocirc(GtkAction * action, gpointer user_data)
970
 
{
971
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
972
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_CIRC_UPPER);
973
 
        else
974
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_CIRC_LOWER);
975
 
}
976
 
 
977
 
static void
978
 
htmlbar_insert_oelig(GtkAction * action, gpointer user_data)
979
 
{
980
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
981
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_ELIG_UPPER);
982
 
        else
983
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_ELIG_LOWER);
984
 
}
985
 
 
986
 
static void
987
 
htmlbar_insert_ograve(GtkAction * action, gpointer user_data)
988
 
{
989
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
990
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_GRAVE_UPPER);
991
 
        else
992
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_GRAVE_LOWER);
993
 
}
994
 
 
995
 
static void
996
 
htmlbar_insert_oslash(GtkAction * action, gpointer user_data)
997
 
{
998
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
999
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_SLASH_UPPER);
1000
 
        else
1001
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_SLASH_LOWER);
1002
 
}
1003
 
 
1004
 
static void
1005
 
htmlbar_insert_otilde(GtkAction * action, gpointer user_data)
1006
 
{
1007
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1008
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_TILDE_UPPER);
1009
 
        else
1010
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_TILDE_LOWER);
1011
 
}
1012
 
 
1013
 
static void
1014
 
htmlbar_insert_ouml(GtkAction * action, gpointer user_data)
1015
 
{
1016
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1017
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_UML_UPPER);
1018
 
        else
1019
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_O_UML_LOWER);
1020
 
}
1021
 
 
1022
 
static void
1023
 
htmlbar_insert_uacute(GtkAction * action, gpointer user_data)
1024
 
{
1025
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1026
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_ACUTE_UPPER);
1027
 
        else
1028
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_ACUTE_LOWER);
1029
 
}
1030
 
 
1031
 
static void
1032
 
htmlbar_insert_ucirc(GtkAction * action, gpointer user_data)
1033
 
{
1034
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1035
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_CIRC_UPPER);
1036
 
        else
1037
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_CIRC_LOWER);
1038
 
}
1039
 
 
1040
 
static void
1041
 
htmlbar_insert_ugrave(GtkAction * action, gpointer user_data)
1042
 
{
1043
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1044
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_GRAVE_UPPER);
1045
 
        else
1046
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_GRAVE_LOWER);
1047
 
}
1048
 
 
1049
 
static void
1050
 
htmlbar_insert_uuml(GtkAction * action, gpointer user_data)
1051
 
{
1052
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1053
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_UML_UPPER);
1054
 
        else
1055
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_U_UML_LOWER);
1056
 
}
1057
 
 
1058
 
static void
1059
 
htmlbar_insert_yacute(GtkAction * action, gpointer user_data)
1060
 
{
1061
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1062
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_Y_ACUTE_UPPER);
1063
 
        else
1064
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_Y_ACUTE_LOWER);
1065
 
}
1066
 
 
1067
 
static void
1068
 
htmlbar_insert_yuml(GtkAction * action, gpointer user_data)
1069
 
{
1070
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_Y_UML_LOWER);
1071
 
}
1072
 
 
1073
 
static void
1074
 
htmlbar_insert_cent_sign(GtkAction * action, gpointer user_data)
1075
 
{
1076
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_CENT);
1077
 
}
1078
 
 
1079
 
static void
1080
 
htmlbar_insert_currency(GtkAction * action, gpointer user_data)
1081
 
{
1082
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_CURRENCY);
1083
 
}
1084
 
 
1085
 
static void
1086
 
htmlbar_insert_euro(GtkAction * action, gpointer user_data)
1087
 
{
1088
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_EURO);
1089
 
}
1090
 
 
1091
 
static void
1092
 
htmlbar_insert_pound(GtkAction * action, gpointer user_data)
1093
 
{
1094
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_POUND);
1095
 
}
1096
 
 
1097
 
static void
1098
 
htmlbar_insert_yen(GtkAction * action, gpointer user_data)
1099
 
{
1100
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_YEN);
1101
 
}
1102
 
 
1103
 
static void
1104
 
htmlbar_insert_division(GtkAction * action, gpointer user_data)
1105
 
{
1106
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_DIVISION);
1107
 
}
1108
 
 
1109
 
static void
1110
 
htmlbar_insert_logical_not(GtkAction * action, gpointer user_data)
1111
 
{
1112
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_LOGICAL_NOT);
1113
 
}
1114
 
 
1115
 
static void
1116
 
htmlbar_insert_times(GtkAction * action, gpointer user_data)
1117
 
{
1118
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_TIMES);
1119
 
}
1120
 
 
1121
 
static void
1122
 
htmlbar_insert_plus_minus(GtkAction * action, gpointer user_data)
1123
 
{
1124
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_PLUS_MINUS);
1125
 
}
1126
 
 
1127
 
static void
1128
 
htmlbar_insert_less_than(GtkAction * action, gpointer user_data)
1129
 
{
1130
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_LESS_THAN);
1131
 
}
1132
 
 
1133
 
static void
1134
 
htmlbar_insert_greater_than(GtkAction * action, gpointer user_data)
1135
 
{
1136
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_GREATER_THAN);
1137
 
}
1138
 
 
1139
 
static void
1140
 
htmlbar_insert_superscript1(GtkAction * action, gpointer user_data)
1141
 
{
1142
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SUPERSCRIPT_1);
1143
 
}
1144
 
 
1145
 
static void
1146
 
htmlbar_insert_superscript2(GtkAction * action, gpointer user_data)
1147
 
{
1148
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SUPERSCRIPT_2);
1149
 
}
1150
 
 
1151
 
static void
1152
 
htmlbar_insert_superscript3(GtkAction * action, gpointer user_data)
1153
 
{
1154
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SUPERSCRIPT_3);
1155
 
}
1156
 
 
1157
 
static void
1158
 
htmlbar_insert_one_quarter(GtkAction * action, gpointer user_data)
1159
 
{
1160
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_FRAC_QUARTER);
1161
 
}
1162
 
 
1163
 
static void
1164
 
htmlbar_insert_one_half(GtkAction * action, gpointer user_data)
1165
 
{
1166
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_FRAC_HALF);
1167
 
}
1168
 
 
1169
 
static void
1170
 
htmlbar_insert_three_quarter(GtkAction * action, gpointer user_data)
1171
 
{
1172
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_FRAC_THREE_QUARTER);
1173
 
}
1174
 
 
1175
 
static void
1176
 
htmlbar_insert_degree(GtkAction * action, gpointer user_data)
1177
 
{
1178
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_DEGREE);
1179
 
}
1180
 
 
1181
 
static void
1182
 
htmlbar_insert_eth(GtkAction * action, gpointer user_data)
1183
 
{
1184
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1185
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_ETH_UPPER);
1186
 
        else
1187
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_ETH_LOWER);
1188
 
}
1189
 
 
1190
 
static void
1191
 
htmlbar_insert_thorn(GtkAction * action, gpointer user_data)
1192
 
{
1193
 
        if (g_str_has_prefix(gtk_action_get_name(action), "Upper"))
1194
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_THORN_UPPER);
1195
 
        else
1196
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_THORN_LOWER);
1197
 
}
1198
 
 
1199
 
static void
1200
 
htmlbar_insert_sharp(GtkAction * action, gpointer user_data)
1201
 
{
1202
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SZLIG);
1203
 
}
1204
 
 
1205
 
static void
1206
 
htmlbar_insert_micro_sign(GtkAction * action, gpointer user_data)
1207
 
{
1208
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_MIRCO);
1209
 
}
1210
 
 
1211
 
static void
1212
795
htmlbar_insert_nbsp(GtkAction * action, gpointer user_data)
1213
796
{
1214
797
        htmlbar_insert_special_char(BFWIN(user_data), BF_NBSP);
1215
798
}
1216
799
 
1217
800
static void
1218
 
htmlbar_insert_section_sign(GtkAction * action, gpointer user_data)
1219
 
{
1220
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SECTION);
1221
 
}
1222
 
 
1223
 
static void
1224
 
htmlbar_insert_copyright(GtkAction * action, gpointer user_data)
1225
 
{
1226
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_COPYRIGHT);
1227
 
}
1228
 
 
1229
 
static void
1230
 
htmlbar_insert_left_angle(GtkAction * action, gpointer user_data)
1231
 
{
1232
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_LEFT_ANGLE);
1233
 
}
1234
 
 
1235
 
static void
1236
 
htmlbar_insert_right_angle(GtkAction * action, gpointer user_data)
1237
 
{
1238
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_RIGHT_ANGLE);
1239
 
}
1240
 
 
1241
 
static void
1242
 
htmlbar_insert_trademark(GtkAction * action, gpointer user_data)
1243
 
{
1244
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_TRADEMARK);
1245
 
}
1246
 
 
1247
 
static void
1248
 
htmlbar_insert_inverted_exclamation(GtkAction * action, gpointer user_data)
1249
 
{
1250
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_INVERTED_EXCLAMATION);
1251
 
}
1252
 
 
1253
 
static void
1254
 
htmlbar_insert_inverted_question_mark(GtkAction * action, gpointer user_data)
1255
 
{
1256
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_INVERTED_QUESTION_MARK);
1257
 
}
1258
 
 
1259
 
static void
1260
 
htmlbar_insert_ordinal(GtkAction * action, gpointer user_data)
1261
 
{
1262
 
        if (g_str_has_suffix(gtk_action_get_name(action), "F"))
1263
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_ORDINAL_F);
1264
 
        else
1265
 
                htmlbar_insert_special_char(BFWIN(user_data), BF_ORDINAL_M);
1266
 
}
1267
 
 
1268
 
static void
1269
 
htmlbar_insert_paragraph(GtkAction * action, gpointer user_data)
1270
 
{
1271
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_PARAGRAPH);
1272
 
}
1273
 
 
1274
 
static void
1275
801
htmlbar_insert_broken_bar(GtkAction * action, gpointer user_data)
1276
802
{
1277
803
        htmlbar_insert_special_char(BFWIN(user_data), BF_BROKEN_BAR);
1283
809
        htmlbar_insert_special_char(BFWIN(user_data), BF_SOFT_HYPHEN);
1284
810
}
1285
811
 
1286
 
static void
1287
 
htmlbar_insert_spacing_macron(GtkAction * action, gpointer user_data)
1288
 
{
1289
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_SPACING_MACRON);
1290
 
}
1291
 
 
1292
 
static void
1293
 
htmlbar_insert_middot(GtkAction * action, gpointer user_data)
1294
 
{
1295
 
        htmlbar_insert_special_char(BFWIN(user_data), BF_MIDDOT);
1296
 
}
1297
 
 
1298
812
void
1299
813
htmlbar_toolbar_show(Thtmlbarwin * hbw, Thtmlbarsession *hbs, gboolean show)
1300
814
{
 
815
        if (htmlbar_v.in_sidepanel)
 
816
                return;
 
817
        
1301
818
        if (show) {
1302
 
                if (hbw->handlebox)
 
819
                if (hbw->handlebox) {
1303
820
                        gtk_widget_show(hbw->handlebox);
1304
 
                else
1305
 
                        htmlbar_toolbar_create(hbw, hbs);
 
821
                } else {
 
822
                        GtkWidget *html_notebook;
 
823
                        html_notebook = htmlbar_toolbar_create(hbw, hbs);
 
824
                        hbw->handlebox = gtk_handle_box_new();
 
825
                        gtk_container_add(GTK_CONTAINER(hbw->handlebox), html_notebook);
 
826
                        gtk_notebook_set_tab_pos(GTK_NOTEBOOK(html_notebook), GTK_POS_TOP);
 
827
                        gtk_box_pack_start(GTK_BOX(hbw->bfwin->toolbarbox), hbw->handlebox, FALSE, FALSE, 0);
 
828
                        gtk_widget_show_all(hbw->handlebox);
 
829
                }
1306
830
        } else {
1307
831
                if (hbw->handlebox)
1308
832
                        gtk_widget_hide(hbw->handlebox);
1424
948
        html5time_dialog(BFWIN(user_data), NULL);
1425
949
}
1426
950
 
 
951
static void
 
952
htmlbar_insert_color(GtkAction * action, gpointer user_data)
 
953
{
 
954
        gchar *color = return_color(NULL);
 
955
        doc_insert_two_strings(BFWIN(user_data)->current_document,color, NULL);
 
956
        g_free(color);
 
957
}
 
958
 
1427
959
static const GtkActionEntry htmlbar_actions[] = {
1428
960
        {"TagsMenu", NULL, N_("T_ags")},
1429
961
        {"HeadingsMenu", NULL, N_("_Headings")},
1439
971
         G_CALLBACK(htmlbar_insert_h5_tag)},
1440
972
        {"HeadingsH6", BF_STOCK_FONTH6, N_("H_6"), "<control><alt>6", N_("Insert H6 tag"),
1441
973
         G_CALLBACK(htmlbar_insert_h6_tag)},
1442
 
        {"SpecialMenu", NULL, N_("_Special")},
1443
 
        {"AccentMenu", NULL, N_("_Accent")},
1444
 
        {"UppercaseMenu", NULL, N_("_Uppercase")},
1445
 
        {"UppercaseAIMenu", NULL, N_("_A-I")},
1446
 
        {"UppercaseAgrave", NULL, N_("A grave À"), NULL, NULL, G_CALLBACK(htmlbar_insert_agrave)},
1447
 
        {"UppercaseAacute", NULL, N_("A acute Á"), NULL, NULL, G_CALLBACK(htmlbar_insert_aacute)},
1448
 
        {"UppercaseAcircumflex", NULL, N_("A circumflex Â"), NULL, NULL, G_CALLBACK(htmlbar_insert_acirc)},
1449
 
        {"UppercaseAtilde", NULL, N_("A tilde Ã"), NULL, NULL, G_CALLBACK(htmlbar_insert_atilde)},
1450
 
        {"UppercaseAEligature", NULL, N_("AE ligature Æ"), NULL, NULL, G_CALLBACK(htmlbar_insert_aelig)},
1451
 
        {"UppercaseAdiaeresis", NULL, N_("A diaeresis Ä"), NULL, NULL, G_CALLBACK(htmlbar_insert_auml)},
1452
 
        {"UppercaseAring", NULL, N_("A ring Å"), NULL, NULL, G_CALLBACK(htmlbar_insert_aring)},
1453
 
        {"UppercaseCcedilla", NULL, N_("C cedilla Ç"), NULL, NULL, G_CALLBACK(htmlbar_insert_ccedil)},
1454
 
        {"UppercaseEgrave", NULL, N_("E grave È"), NULL, NULL, G_CALLBACK(htmlbar_insert_egrave)},
1455
 
        {"UppercaseEacute", NULL, N_("E acute É"), NULL, NULL, G_CALLBACK(htmlbar_insert_eacute)},
1456
 
        {"UppercaseEcircumflex", NULL, N_("E circumflex Ê"), NULL, NULL, G_CALLBACK(htmlbar_insert_ecirc)},
1457
 
        {"UppercaseEdiaeresis", NULL, N_("E diaeresis Ë"), NULL, NULL, G_CALLBACK(htmlbar_insert_euml)},
1458
 
        {"UppercaseIgrave", NULL, N_("I grave Ì"), NULL, NULL, G_CALLBACK(htmlbar_insert_igrave)},
1459
 
        {"UppercaseIacute", NULL, N_("I acute Í"), NULL, NULL, G_CALLBACK(htmlbar_insert_iacute)},
1460
 
        {"UppercaseIcircumflex", NULL, N_("I circumflex Î"), NULL, NULL, G_CALLBACK(htmlbar_insert_icirc)},
1461
 
        {"UppercaseIdiaeresis", NULL, N_("I diaeresis Ï"), NULL, NULL, G_CALLBACK(htmlbar_insert_iuml)},
1462
 
        {"UppercaseJZMenu", NULL, N_("_J-Z")},
1463
 
        {"UppercaseNtilde", NULL, N_("N tilde Ñ"), NULL, NULL, G_CALLBACK(htmlbar_insert_ntilde)},
1464
 
        {"UppercaseOgrave", NULL, N_("O grave Ò"), NULL, NULL, G_CALLBACK(htmlbar_insert_ograve)},
1465
 
        {"UppercaseOacute", NULL, N_("O acute Ó"), NULL, NULL, G_CALLBACK(htmlbar_insert_oacute)},
1466
 
        {"UppercaseOcircumflex", NULL, N_("O circumflex Ô"), NULL, NULL, G_CALLBACK(htmlbar_insert_ocirc)},
1467
 
        {"UppercaseOEligature", NULL, N_("OE ligature Œ"), NULL, NULL, G_CALLBACK(htmlbar_insert_oelig)},
1468
 
        {"UppercaseOtilde", NULL, N_("O tilde Õ"), NULL, NULL, G_CALLBACK(htmlbar_insert_otilde)},
1469
 
        {"UppercaseOdiaeresis", NULL, N_("O diaeresis Ö"), NULL, NULL, G_CALLBACK(htmlbar_insert_ouml)},
1470
 
        {"UppercaseOslash", NULL, N_("O slash Ø"), NULL, NULL, G_CALLBACK(htmlbar_insert_oslash)},
1471
 
        {"UppercaseUgrave", NULL, N_("U grave Ù"), NULL, NULL, G_CALLBACK(htmlbar_insert_ugrave)},
1472
 
        {"UppercaseUacute", NULL, N_("U acute Ú"), NULL, NULL, G_CALLBACK(htmlbar_insert_uacute)},
1473
 
        {"UppercaseUcircumflex", NULL, N_("U circumflex Û"), NULL, NULL, G_CALLBACK(htmlbar_insert_ucirc)},
1474
 
        {"UppercaseUdiaeresis", NULL, N_("U diaeresis Ü"), NULL, NULL, G_CALLBACK(htmlbar_insert_uuml)},
1475
 
        {"UppercaseYacute", NULL, N_("Y acute Ý"), NULL, NULL, G_CALLBACK(htmlbar_insert_yacute)},
1476
 
        {"LowercaseMenu", NULL, N_("_Lowercase")},
1477
 
        {"LowercaseAIMenu", NULL, N_("_A-I")},
1478
 
        {"LowercaseAgrave", NULL, N_("a grave à"), NULL, NULL, G_CALLBACK(htmlbar_insert_agrave)},
1479
 
        {"LowercaseAacute", NULL, N_("a acute á"), NULL, NULL, G_CALLBACK(htmlbar_insert_aacute)},
1480
 
        {"LowercaseAcircumflex", NULL, N_("a circumflex â"), NULL, NULL, G_CALLBACK(htmlbar_insert_acirc)},
1481
 
        {"LowercaseAtilde", NULL, N_("a tilde ã"), NULL, NULL, G_CALLBACK(htmlbar_insert_atilde)},
1482
 
        {"LowercaseAring", NULL, N_("a ring å"), NULL, NULL, G_CALLBACK(htmlbar_insert_aring)},
1483
 
        {"LowercaseAEligature", NULL, N_("ae ligature æ"), NULL, NULL, G_CALLBACK(htmlbar_insert_aelig)},
1484
 
        {"LowercaseAdiaeresis", NULL, N_("a diaeresis ä"), NULL, NULL, G_CALLBACK(htmlbar_insert_auml)},
1485
 
        {"LowercaseCcedilla", NULL, N_("c cedilla ç"), NULL, NULL, G_CALLBACK(htmlbar_insert_ccedil)},
1486
 
        {"LowercaseEgrave", NULL, N_("e grave è"), NULL, NULL, G_CALLBACK(htmlbar_insert_egrave)},
1487
 
        {"LowercaseEacute", NULL, N_("e acute é"), NULL, NULL, G_CALLBACK(htmlbar_insert_eacute)},
1488
 
        {"LowercaseEcircumflex", NULL, N_("e circumflex ê"), NULL, NULL, G_CALLBACK(htmlbar_insert_ecirc)},
1489
 
        {"LowercaseEdiaeresis", NULL, N_("e diaeresis ë"), NULL, NULL, G_CALLBACK(htmlbar_insert_euml)},
1490
 
        {"LowercaseIgrave", NULL, N_("i grave ì"), NULL, NULL, G_CALLBACK(htmlbar_insert_igrave)},
1491
 
        {"LowercaseIacute", NULL, N_("i acute í"), NULL, NULL, G_CALLBACK(htmlbar_insert_iacute)},
1492
 
        {"LowercaseIcircumflex", NULL, N_("i circumflex î"), NULL, NULL, G_CALLBACK(htmlbar_insert_icirc)},
1493
 
        {"LowercaseIdiaeresis", NULL, N_("i diaeresis ï"), NULL, NULL, G_CALLBACK(htmlbar_insert_iuml)},
1494
 
        {"LowercaseJZMenu", NULL, N_("_J-Z")},
1495
 
        {"LowercaseNtilde", NULL, N_("n tilde ñ"), NULL, NULL, G_CALLBACK(htmlbar_insert_ntilde)},
1496
 
        {"LowercaseOgrave", NULL, N_("o grave ò"), NULL, NULL, G_CALLBACK(htmlbar_insert_ograve)},
1497
 
        {"LowercaseOacute", NULL, N_("o acute ó"), NULL, NULL, G_CALLBACK(htmlbar_insert_oacute)},
1498
 
        {"LowercaseOEligature", NULL, N_("oe ligature œ"), NULL, NULL, G_CALLBACK(htmlbar_insert_oelig)},
1499
 
        {"LowercaseOcircumflex", NULL, N_("o circumflex ô"), NULL, NULL, G_CALLBACK(htmlbar_insert_ocirc)},
1500
 
        {"LowercaseOtilde", NULL, N_("o tilde õ"), NULL, NULL, G_CALLBACK(htmlbar_insert_otilde)},
1501
 
        {"LowercaseOdiaeresis", NULL, N_("o diaeresis ö"), NULL, NULL, G_CALLBACK(htmlbar_insert_ouml)},
1502
 
        {"LowercaseOslash", NULL, N_("o slash ø"), NULL, NULL, G_CALLBACK(htmlbar_insert_oslash)},
1503
 
        {"LowercaseUgrave", NULL, N_("u grave ù"), NULL, NULL, G_CALLBACK(htmlbar_insert_ugrave)},
1504
 
        {"LowercaseUacute", NULL, N_("u acute ú"), NULL, NULL, G_CALLBACK(htmlbar_insert_uacute)},
1505
 
        {"LowercaseUcircumflex", NULL, N_("u circumflex û"), NULL, NULL, G_CALLBACK(htmlbar_insert_ucirc)},
1506
 
        {"LowercaseUdiaeresis", NULL, N_("u diaeresis ü"), NULL, NULL, G_CALLBACK(htmlbar_insert_uuml)},
1507
 
        {"LowercaseYacute", NULL, N_("y acute ý"), NULL, NULL, G_CALLBACK(htmlbar_insert_yacute)},
1508
 
        {"LowercaseYdiaeresis", NULL, N_("y diaeresis ÿ"), NULL, NULL, G_CALLBACK(htmlbar_insert_yuml)},
1509
 
        {"Acute", NULL, N_("_Acute ´"), NULL, NULL, G_CALLBACK(htmlbar_insert_acute)},
1510
 
        {"Cedilla", NULL, N_("_Cedilla ¸"), NULL, NULL, G_CALLBACK(htmlbar_insert_cedilla)},
1511
 
        {"Umlaut", NULL, N_("U_mlaut ¨"), NULL, NULL, G_CALLBACK(htmlbar_insert_umlaut)},
1512
 
        {"CurrencyMenu", NULL, N_("_Currency")},
1513
 
        {"CentSign", NULL, N_("_Cent sign ¢"), NULL, NULL, G_CALLBACK(htmlbar_insert_cent_sign)},
1514
 
        {"PoundSterling", NULL, N_("_Pound sterling £"), NULL, NULL, G_CALLBACK(htmlbar_insert_pound)},
1515
 
        {"CurrencySign", NULL, N_("C_urrency sign ¤"), NULL, NULL, G_CALLBACK(htmlbar_insert_currency)},
1516
 
        {"YenSign", NULL, N_("_Yen sign ¥"), NULL, NULL, G_CALLBACK(htmlbar_insert_yen)},
1517
 
        {"Euro", NULL, N_("_Euro €"), NULL, NULL, G_CALLBACK(htmlbar_insert_euro)},
1518
 
        {"MathScienceMenu", NULL, N_("_Math-Science")},
1519
 
        {"LogicalNot", NULL, N_("Logical _not sign ¬"), NULL, NULL, G_CALLBACK(htmlbar_insert_logical_not)},
1520
 
        {"Multiplication", NULL, N_("_Multiplication sign ×"), NULL, NULL, G_CALLBACK(htmlbar_insert_times)},
1521
 
        {"Division", NULL, N_("_Division sign ÷"), "<control><alt>slash", NULL,
1522
 
         G_CALLBACK(htmlbar_insert_division)},
1523
 
        {"PlusMinus", NULL, N_("_Plus-minus sign ±"), NULL, NULL, G_CALLBACK(htmlbar_insert_plus_minus)},
1524
 
        {"LessThan", NULL, N_("_Less-than sign <"), "<control><alt>comma", NULL,
1525
 
         G_CALLBACK(htmlbar_insert_less_than)},
1526
 
        {"GreaterThan", NULL, N_("_Greater-than sign >"), "<control><alt>period", NULL,
1527
 
         G_CALLBACK(htmlbar_insert_greater_than)},
1528
 
        {"Superscript1", NULL, N_("Superscript _1 ¹"), NULL, NULL, G_CALLBACK(htmlbar_insert_superscript1)},
1529
 
        {"Superscript2", NULL, N_("Superscript _2 ²"), NULL, NULL, G_CALLBACK(htmlbar_insert_superscript2)},
1530
 
        {"Superscript3", NULL, N_("Superscript _3 ³"), NULL, NULL, G_CALLBACK(htmlbar_insert_superscript3)},
1531
 
        {"OneQuarter", NULL, N_("One _quarter ¼"), NULL, NULL, G_CALLBACK(htmlbar_insert_one_quarter)},
1532
 
        {"OneHalf", NULL, N_("One _half ½"), NULL, NULL, G_CALLBACK(htmlbar_insert_one_half)},
1533
 
        {"ThreeQuarters", NULL, N_("_Three quarters ¾"), NULL, NULL,
1534
 
         G_CALLBACK(htmlbar_insert_three_quarter)},
1535
 
        {"DegreeSign", NULL, N_("Deg_ree sign °"), NULL, NULL, G_CALLBACK(htmlbar_insert_degree)},
1536
 
        {"NonLatinMenu", NULL, N_("_Non Latin")},
1537
 
        {"UppercaseETH", NULL, N_("_ETH (Icelandic) Ð"), NULL, NULL, G_CALLBACK(htmlbar_insert_eth)},
1538
 
        {"UppercaseTHORN", NULL, N_("_THORN (Icelandic) Þ"), NULL, NULL, G_CALLBACK(htmlbar_insert_thorn)},
1539
 
        {"LowercaseETH", NULL, N_("et_h (Icelandic) ð"), NULL, NULL, G_CALLBACK(htmlbar_insert_eth)},
1540
 
        {"LowercaseTHORN", NULL, N_("th_orn þ"), NULL, NULL, G_CALLBACK(htmlbar_insert_thorn)},
1541
 
        {"NonLatinSharp", NULL, N_("Sharp _s ß"), NULL, NULL, G_CALLBACK(htmlbar_insert_sharp)},
1542
 
        {"NonLatinMicroSign", NULL, N_("_Micro sign µ"), NULL, NULL, G_CALLBACK(htmlbar_insert_micro_sign)},
1543
 
        {"SpecialOtherMenu", NULL, N_("_Other")},
 
974
        {"SpecialMenu", NULL, N_("_Entities")},
1544
975
        {"NBSP", NULL, N_("_Non-breaking space"), NULL, NULL, G_CALLBACK(htmlbar_insert_nbsp)},
1545
 
        {"SectionSign", NULL, N_("_Section sign §"), NULL, NULL, G_CALLBACK(htmlbar_insert_section_sign)},
1546
 
        {"Copyright", NULL, N_("_Copyright sign ©"), NULL, NULL, G_CALLBACK(htmlbar_insert_copyright)},
1547
 
        {"LeftAngleQuote", NULL, N_("_Left angle quotes «"), NULL, NULL,
1548
 
         G_CALLBACK(htmlbar_insert_left_angle)},
1549
 
        {"RightAngleQuote", NULL, N_("_Right angle quotes »"), NULL, NULL,
1550
 
         G_CALLBACK(htmlbar_insert_right_angle)},
1551
 
        {"Trademark", NULL, N_("Registered _trademark ®"), NULL, NULL, G_CALLBACK(htmlbar_insert_trademark)},
1552
 
        {"InvertedExclamation", NULL, N_("Inverted _exclamation ¡"), NULL, NULL,
1553
 
         G_CALLBACK(htmlbar_insert_inverted_exclamation)},
1554
 
        {"InvertedQuestionMark", NULL, N_("Inverted _question mark ¿"), NULL, NULL,
1555
 
         G_CALLBACK(htmlbar_insert_inverted_question_mark)},
1556
 
        {"FeminineOrdinal", NULL, N_("_Feminine ordinal ª"), NULL, NULL, G_CALLBACK(htmlbar_insert_ordinal)},
1557
 
        {"MasculineOrdinal", NULL, N_("_Masculine ordinal º"), NULL, NULL,
1558
 
         G_CALLBACK(htmlbar_insert_ordinal)},
1559
 
        {"Pilcrow", NULL, N_("_Pilcrow (paragraph sign) ¶"), NULL, NULL,
1560
 
         G_CALLBACK(htmlbar_insert_paragraph)},
1561
976
        {"BrokenBar", NULL, N_("_Broken bar ¦"), NULL, NULL, G_CALLBACK(htmlbar_insert_broken_bar)},
1562
977
        {"SoftHyphen", NULL, N_("Soft _hyphen -"), NULL, NULL, G_CALLBACK(htmlbar_insert_soft_hyphen)},
1563
 
        {"SpacingMacron", NULL, N_("Spa_cing macron ¯"), NULL, NULL,
1564
 
         G_CALLBACK(htmlbar_insert_spacing_macron)},
1565
 
        {"MidDot", NULL, N_("Middle _dot ·"), NULL, NULL, G_CALLBACK(htmlbar_insert_middot)},
1566
978
        {"FormatContextMenu", NULL, N_("_Format by Context")},
1567
979
        {"FormatStrong", BF_STOCK_BOLD, N_("_Strong"), "<control><alt>g", N_("Strong"),
1568
980
         G_CALLBACK(htmlbar_insert_strong_tag)},
1713
1125
        {"DialogsTableData", BF_STOCK_TABLE_TD, N_("Table _Data..."), NULL, N_("Table Data..."),
1714
1126
         G_CALLBACK(htmlbar_dialog_table_data)},
1715
1127
        {"DialogsCSSMenu", NULL, N_("_CSS")},
1716
 
        {"DialogsCreateStyle", BF_STOCK_CSSNEWSTYLE, N_("_Create Style..."), "<shift><alt>S",
 
1128
        {"DialogsCreateStyle", BF_STOCK_CSSNEWSTYLE, N_("_Create Style..."), "<control><shift><alt>S",
1717
1129
         N_("Create stylesheet..."),
1718
1130
         G_CALLBACK(htmlbar_dialog_style_create)},
1719
1131
        {"DialogsSpan", BF_STOCK_CSSSPAN, N_("S_pan..."), NULL, N_("Span..."), G_CALLBACK(htmlbar_dialog_span)},
1721
1133
         G_CALLBACK(htmlbar_dialog_div)},
1722
1134
        {"MiscStyle", BF_STOCK_CSSSTYLE, N_("_Style"), NULL, N_("Style"),
1723
1135
         G_CALLBACK(htmlbar_misc_style)},
 
1136
        {"Dialogscolumns", BF_STOCK_CSS_COLUMNS, N_("C_olumns..."), NULL, N_("Columns..."),
 
1137
         G_CALLBACK(htmlbar_dialog_columns)},    
1724
1138
        {"DialogsLinkStylesheet", BF_STOCK_LINK_STYLESHEET, N_("_Link to Stylesheet..."), NULL,
1725
1139
         N_("Link to Stylesheet..."),
1726
1140
         G_CALLBACK(htmlbar_dialog_style_link_to)},
1781
1195
        {"DialogsAudio", BF_STOCK_AUDIO, N_("Au_dio..."), NULL, N_("Audio..."), G_CALLBACK(htmlbar_dialog_audio)},
1782
1196
        {"DialogsVideo", BF_STOCK_VIDEO, N_("_Video..."), NULL, N_("Video..."), G_CALLBACK(htmlbar_dialog_video)},
1783
1197
        {"DialogsCanvas", BF_STOCK_CANVAS, N_("_Canvas..."), NULL, N_("Canvas..."), G_CALLBACK(htmlbar_dialog_canvas)},
1784
 
        {"DialogsHtml5Time", BF_STOCK_HTML5TIME, N_("_Time..."), NULL, N_("Time..."), G_CALLBACK(htmlbar_dialog_html5time)}
 
1198
        {"DialogsHtml5Time", BF_STOCK_HTML5TIME, N_("_Time..."), NULL, N_("Time..."), G_CALLBACK(htmlbar_dialog_html5time)},
 
1199
        {"InsertColor", GTK_STOCK_SELECT_COLOR, N_("Insert _Color"), NULL, N_("Insert Color"), G_CALLBACK(htmlbar_insert_color)},
1785
1200
};
1786
1201
 
1787
1202
void
2003
1418
        }
2004
1419
}
2005
1420
 
2006
 
void
 
1421
static GtkWidget *new_html_subtoolbar(Thtmlbarwin * hbw, GtkWidget *html_notebook, GtkWidget *toolbar, const gchar *labeltext)
 
1422
{
 
1423
        GtkWidget *label;
 
1424
        
 
1425
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
 
1426
        if (htmlbar_v.in_sidepanel) {
 
1427
                gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_VERTICAL);
 
1428
        }
 
1429
        label = gtk_label_new(labeltext);
 
1430
/*      gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);*/
 
1431
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, label);
 
1432
#if GTK_CHECK_VERSION(2,20,0)
 
1433
        gtk_container_child_set(GTK_CONTAINER(html_notebook), label, "tab-fill", TRUE, "tab-expand", TRUE, NULL);
 
1434
#else
 
1435
        gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(html_notebook),label,TRUE,TRUE,GTK_PACK_START);
 
1436
#endif
 
1437
        return toolbar; 
 
1438
}
 
1439
 
 
1440
GtkWidget *
2007
1441
htmlbar_toolbar_create(Thtmlbarwin * hbw, Thtmlbarsession *hbs)
2008
1442
{
2009
1443
        Tbfwin *bfwin = hbw->bfwin;
2012
1446
        GtkWidget *toolbar;
2013
1447
 
2014
1448
        html_notebook = gtk_notebook_new();
2015
 
        gtk_notebook_set_tab_pos(GTK_NOTEBOOK(html_notebook), GTK_POS_TOP);
 
1449
        
2016
1450
        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(html_notebook), TRUE);
2017
1451
        gtk_notebook_set_show_border(GTK_NOTEBOOK(html_notebook), TRUE);
2018
 
        hbw->handlebox = gtk_handle_box_new();
2019
 
        gtk_container_add(GTK_CONTAINER(hbw->handlebox), html_notebook);
2020
 
        gtk_box_pack_start(GTK_BOX(bfwin->toolbarbox), hbw->handlebox, FALSE, FALSE, 0);
 
1452
        gtk_notebook_set_scrollable(GTK_NOTEBOOK(html_notebook), TRUE);
2021
1453
 
2022
 
        hbw->quickbar_toolbar = gtk_toolbar_new();
2023
 
        gtk_toolbar_set_style(GTK_TOOLBAR(hbw->quickbar_toolbar), GTK_TOOLBAR_ICONS);
2024
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), hbw->quickbar_toolbar, gtk_label_new(_(" Quickbar ")));
 
1454
        hbw->quickbar_toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_toolbar_new(), _("Quickbar"));
2025
1455
        htmlbar_load_quickbar(hbw, hbw->quickbar_toolbar);
2026
1456
 
2027
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLStandardToolbar");
2028
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2029
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Standard ")));
2030
 
        setup_items_for_quickbar(hbw, toolbar);
2031
 
 
2032
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFontsToolbar");
2033
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2034
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Fonts ")));
2035
 
        setup_items_for_quickbar(hbw, toolbar);
2036
 
 
2037
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFormattingToolbar");
2038
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2039
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Formatting ")));
2040
 
        setup_items_for_quickbar(hbw, toolbar);
2041
 
 
2042
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLTablesToolbar");
2043
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2044
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Tables ")));
2045
 
        setup_items_for_quickbar(hbw, toolbar);
2046
 
 
2047
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFramesToolbar");
2048
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2049
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Frames ")));
2050
 
        setup_items_for_quickbar(hbw, toolbar);
2051
 
 
2052
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFormsToolbar");
2053
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2054
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" Forms ")));
2055
 
        setup_items_for_quickbar(hbw, toolbar);
2056
 
 
2057
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLListToolbar");
2058
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2059
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" List ")));
2060
 
        setup_items_for_quickbar(hbw, toolbar);
2061
 
 
2062
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLCSSToolbar");
2063
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2064
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" CSS ")));
2065
 
        setup_items_for_quickbar(hbw, toolbar);
2066
 
 
2067
 
        toolbar = gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLHTML5Toolbar");
2068
 
        gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
2069
 
        gtk_notebook_append_page(GTK_NOTEBOOK(html_notebook), toolbar, gtk_label_new(_(" HTML 5 ")));
2070
 
        setup_items_for_quickbar(hbw, toolbar);
2071
 
        
2072
 
        gtk_widget_show_all(hbw->handlebox);
 
1457
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLStandardToolbar"), _("Standard"));
 
1458
        setup_items_for_quickbar(hbw, toolbar);
 
1459
 
 
1460
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLHTML5Toolbar"), _("HTML 5"));
 
1461
        setup_items_for_quickbar(hbw, toolbar);
 
1462
 
 
1463
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFormattingToolbar"), _("Formatting"));
 
1464
        setup_items_for_quickbar(hbw, toolbar);
 
1465
 
 
1466
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLTablesToolbar"), _("Tables"));
 
1467
        setup_items_for_quickbar(hbw, toolbar);
 
1468
        
 
1469
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLListToolbar"), _("List"));
 
1470
        setup_items_for_quickbar(hbw, toolbar);
 
1471
        
 
1472
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLCSSToolbar"), _("CSS"));
 
1473
        setup_items_for_quickbar(hbw, toolbar);
 
1474
 
 
1475
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFormsToolbar"), _("Forms"));
 
1476
        setup_items_for_quickbar(hbw, toolbar);
 
1477
 
 
1478
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFontsToolbar"), _("Fonts"));
 
1479
        setup_items_for_quickbar(hbw, toolbar);
 
1480
 
 
1481
        toolbar = new_html_subtoolbar(hbw, html_notebook, gtk_ui_manager_get_widget(bfwin->uimanager, "/HTMLFramesToolbar"), _("Frames"));
 
1482
        setup_items_for_quickbar(hbw, toolbar);
2073
1483
        
2074
1484
        gtk_notebook_set_current_page(GTK_NOTEBOOK(html_notebook), hbs->notebooktab);
2075
1485
        DEBUG_MSG("htmlbar htmlbar_toolbar_create, make page %d active\n", hbs->notebooktab);
2076
1486
        g_signal_connect(G_OBJECT(html_notebook), "switch-page", G_CALLBACK(notebook_switch_page_lcb), hbw);
2077
 
 
2078
1487
        
 
1488
        return html_notebook;
2079
1489
}
2080
1490
 
2081
1491
void htmlbar_load_ui(Thtmlbarwin * hbw)
2113
1523
                        {pixmap_cssnewstyle, BF_STOCK_CSSNEWSTYLE},
2114
1524
                        {pixmap_cssspan, BF_STOCK_CSSSPAN},
2115
1525
                        {pixmap_cssstyle, BF_STOCK_CSSSTYLE},
 
1526
                        {pixmap_css_columns, BF_STOCK_CSS_COLUMNS},
2116
1527
                        {pixmap_del, BF_STOCK_DEL},
2117
1528
                        {pixmap_dfn, BF_STOCK_DFN},
2118
1529
                        {pixmap_edit_tag, BF_STOCK_EDIT_TAG},