/* Bullet form callbacks */
#include <config.h>
-#include <stdlib.h>
+#include <cstdlib>
#include FORMS_H_LOCATION
#include XPM_H_LOCATION
#include "bullet_forms.h"
#include "bmtable.h"
#include "buffer.h"
#include "bufferparams.h"
-#include "filetools.h"
+#include "support/filetools.h"
#include "gettext.h"
#include "lyx_gui_misc.h" // CancelCloseBoxCB + WriteAlert
-extern int mono_video;
-extern BufferView *current_view;
-FD_form_bullet *fd_form_bullet;
+extern BufferView * current_view;
+FD_form_bullet * fd_form_bullet;
static int current_bullet_panel;
static int current_bullet_depth;
void bulletForm()
{
if (!fd_form_bullet) {
- if (!mono_video
- && (XpmVersion < 4
- || (XpmVersion == 4 && XpmRevision < 7))) {
+ if ((XpmVersion < 4
+ || (XpmVersion == 4 && XpmRevision < 7))) {
WriteAlert(_("Sorry, your libXpm is too old."),
_("This feature requires xpm-4.7 (a.k.a 3.4g) or newer."),
- _("Try running LyX in mono mode (lyx -Mono)."));
+ "");
return;
}
fd_form_bullet = create_form_form_bullet();
" normal | large | Large | LARGE | huge | Huge"));
fl_set_choice(fd_form_bullet->choice_bullet_size, 1);
fl_set_form_atclose(fd_form_bullet->form_bullet,
- CancelCloseBoxCB, NULL);
+ CancelCloseBoxCB, 0);
}
if (updateBulletForm()) {
}
else {
fl_show_form(fd_form_bullet->form_bullet,
- FL_PLACE_MOUSE,FL_FULLBORDER,
+ FL_PLACE_MOUSE, FL_FULLBORDER,
_("Itemize Bullet Selection"));
}
}
}
if (!current_view->available()) {
update = false;
- } else if (current_view->currentBuffer()->isReadonly()
- || current_view->currentBuffer()->isLinuxDoc()) {
+ } else if (current_view->buffer()->isReadonly()
+ || current_view->buffer()->isLinuxDoc()) {
fl_deactivate_object (fd_form_bullet->button_ok);
fl_deactivate_object (fd_form_bullet->button_apply);
fl_set_object_lcol (fd_form_bullet->button_ok, FL_INACTIVE);
// any settings that need doing each time
fl_set_button(fd_form_bullet->radio_bullet_depth_1, 1);
fl_set_input(fd_form_bullet->input_bullet_latex,
- current_view->currentBuffer()
+ current_view->buffer()
->params.user_defined_bullets[0].c_str());
fl_set_choice(fd_form_bullet->choice_bullet_size,
- current_view->currentBuffer()
+ current_view->buffer()
->params.user_defined_bullets[0].getSize() + 2);
} else {
if (fd_form_bullet->form_bullet->visible) {
void BulletApplyCB(FL_OBJECT * /*ob*/, long /*data*/ )
{
- /* update the bullet settings */
- BufferParams & param = current_view->currentBuffer()->params;
+ // update the bullet settings
+ BufferParams & param = current_view->buffer()->params;
// a little bit of loop unrolling
param.user_defined_bullets[0] = param.temp_bullets[0];
param.user_defined_bullets[1] = param.temp_bullets[1];
param.user_defined_bullets[2] = param.temp_bullets[2];
param.user_defined_bullets[3] = param.temp_bullets[3];
- current_view->currentBuffer()->markDirty();
+ current_view->buffer()->markDirty();
}
{
fl_hide_form(fd_form_bullet->form_bullet);
// this avoids confusion when reopening
- BufferParams & param = current_view->currentBuffer()->params;
+ BufferParams & param = current_view->buffer()->params;
param.temp_bullets[0] = param.user_defined_bullets[0];
param.temp_bullets[1] = param.user_defined_bullets[1];
param.temp_bullets[2] = param.user_defined_bullets[2];
void InputBulletLaTeXCB(FL_OBJECT *, long)
{
- /* fill-in code for callback */
- BufferParams & param = current_view->currentBuffer()->params;
+ // fill-in code for callback
+ BufferParams & param = current_view->buffer()->params;
param.temp_bullets[current_bullet_depth].setText(
fl_get_input(fd_form_bullet->input_bullet_latex));
void ChoiceBulletSizeCB(FL_OBJECT * ob, long /*data*/ )
{
- BufferParams & param = current_view->currentBuffer()->params;
+ BufferParams & param = current_view->buffer()->params;
// convert from 1-6 range to -1-4
param.temp_bullets[current_bullet_depth].setSize(fl_get_choice(ob) - 2);
}
-void BulletDepthCB(FL_OBJECT *ob, long data)
+void BulletDepthCB(FL_OBJECT * ob, long data)
{
/* Should I do the following: */
/* 1. change to the panel that the current bullet belongs in */
/* */
/* I'm inclined to just go with 3 and 4 at the moment and */
/* maybe try to support the others later */
- BufferParams & param = current_view->currentBuffer()->params;
+ BufferParams & param = current_view->buffer()->params;
switch (fl_get_button_numb(ob)) {
case 3:
/* free the current pixmap */
fl_free_bmtable_pixmap(fd_form_bullet->bmtable_bullet_panel);
- LString new_panel;
+ string new_panel;
switch (data) {
/* display the new one */
case 0 :
new_panel = "standard";
break;
}
- if (mono_video) {
- new_panel += ".xbm";
- fl_set_bmtable_file(fd_form_bullet->bmtable_bullet_panel, 6, 6,
- LibFileSearch("images", new_panel.c_str()).c_str());
- }
- else {
- new_panel += ".xpm";
- fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6,
- LibFileSearch("images", new_panel.c_str()).c_str());
- }
+ new_panel += ".xpm";
+ fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6,
+ LibFileSearch("images", new_panel.c_str()).c_str());
fl_redraw_object(fd_form_bullet->bmtable_bullet_panel);
fl_unfreeze_form(fd_form_bullet->form_bullet);
}
/* to that extracted from the current chosen position of the BMTable */
/* Don't forget to free the button's old pixmap first. */
- BufferParams & param = current_view->currentBuffer()->params;
+ BufferParams & param = current_view->buffer()->params;
int bmtable_button = fl_get_bmtable(ob);
/* try to keep the button held down till another is pushed */