anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rob's about LyX dialog, tweaked a little.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5473 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-10-22 15:00:45 +00:00
parent 6f0a60f86c
commit bb7c6adc28
3 changed files with 113 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-22 Rob Lahaye <lahaye@snu.ac.kr>
* forms/form_aboutlyx.fd: implement the text widgets as browsers
* FormAboutlyx.C (build): Rearrange tabs. Add Build-info. Prettify.
2002-10-22 Angus Leeming <leeming@lyx.org>
* Makefile.am (libxforms_la_SOURCES): arrange list into alphabetical

54
src/frontends/xforms/FormAboutlyx.C
View File

@ -5,6 +5,7 @@
*
* \author Edwin Leuven
* \author Angus Leeming
* \author Rob Lahaye
*
* Full author contact details are available in file CREDITS
*/
@ -20,10 +21,13 @@
#include "ControlAboutlyx.h"
#include "forms/form_aboutlyx.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "Lsstream.h"
#include "version.h"
#include FORMS_H_LOCATION
using std::string;
using std::getline;
typedef FormCB<ControlAboutlyx, FormDB<FD_aboutlyx> > base_class;
@ -38,35 +42,39 @@ void FormAboutlyx::build()
// create version tab
version_.reset(build_aboutlyx_version(this));
fl_set_object_label(version_->text_version,
controller().getVersion().c_str());
fl_set_object_label(version_->text_copyright,
controller().getCopyright().c_str());
// create license and warranty tab
ostringstream vs;
vs << controller().getVersion()
<< '\n' << lyx_version_info;
fl_add_browser_line(version_->browser_version, vs.str().c_str());
// create credits tab
credits_.reset(build_aboutlyx_credits(this));
ostringstream crs;
controller().getCredits(crs);
fl_add_browser_line(credits_->browser_credits, crs.str().c_str());
// create license tab
license_.reset(build_aboutlyx_license(this));
int const width = license_->browser_license->w - 10;
string str = formatted(controller().getLicense(),
license_->text_license->w - 10);
fl_set_object_label(license_->text_license, str.c_str());
ostringstream cs;
cs << controller().getCopyright() << "\n\n"
<< formatted(controller().getLicense(), width) << "\n\n"
<< formatted(controller().getDisclaimer(), width);
str = formatted(controller().getDisclaimer(),
license_->text_warranty->w - 10);
fl_set_object_label(license_->text_warranty, str.c_str());
// create credits
credits_.reset(build_aboutlyx_credits(this));
ostringstream ss;
controller().getCredits(ss);
fl_add_browser_line(credits_->browser_credits, ss.str().c_str());
fl_add_browser_line(license_->browser_license, cs.str().c_str());
// stack tabs
fl_addto_tabfolder(dialog_->tabfolder,_("Copyright and Version"),
fl_addto_tabfolder(dialog_->tabfolder, _("Version"),
version_->form);
fl_addto_tabfolder(dialog_->tabfolder,_("License and Warranty"),
license_->form);
fl_addto_tabfolder(dialog_->tabfolder,_("Credits"),
fl_addto_tabfolder(dialog_->tabfolder, _("Credits"),
credits_->form);
fl_addto_tabfolder(dialog_->tabfolder, _("License"),
license_->form);
// work-around xforms bug re update of folder->x, folder->y coords.
setPrehandler(dialog_->tabfolder);

187
src/frontends/xforms/forms/form_aboutlyx.fd
View File

@ -5,27 +5,28 @@ Internal Form Definition File
Number of forms: 4
Unit of measure: FL_COORD_PIXEL
SnapGrid: 5
=============== FORM ===============
Name: form_aboutlyx
Width: 450
Height: 400
Width: 395
Height: 365
Number of Objects: 3
--------------------
class: FL_BOX
type: UP_BOX
box: 0 0 450 400
boxtype: FL_UP_BOX
type: FLAT_BOX
box: 0 0 395 365
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
@ -33,7 +34,7 @@ argument:
--------------------
class: FL_BUTTON
type: NORMAL_BUTTON
box: 320 360 120 30
box: 300 335 90 25
boxtype: FL_UP_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -42,8 +43,8 @@ size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Close|^[
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_NONE
gravity: FL_SouthEast FL_SouthEast
name: button_close
callback: C_FormBaseCancelCB
argument: 0
@ -51,101 +52,41 @@ argument: 0
--------------------
class: FL_TABFOLDER
type: TOP_TABFOLDER
box: 10 20 430 330
boxtype: FL_UP_BOX
box: 0 5 395 325
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_TOP_LEFT
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
label: Tabbed folder
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
resize: FL_RESIZE_ALL
gravity: FL_NorthWest FL_SouthEast
name: tabfolder
callback:
argument:
=============== FORM ===============
Name: form_aboutlyx_version
Width: 430
Height: 310
Number of Objects: 3
--------------------
class: FL_BOX
type: FLAT_BOX
box: 0 0 430 310
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name:
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 10 410 110
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Text
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_copyright
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 130 410 170
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Text
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_version
callback:
argument:
=============== FORM ===============
Name: form_aboutlyx_credits
Width: 430
Height: 310
Width: 395
Height: 300
Number of Objects: 2
--------------------
class: FL_BOX
type: FLAT_BOX
box: 0 0 430 310
box: 0 0 395 300
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
@ -153,31 +94,31 @@ argument:
--------------------
class: FL_BROWSER
type: NORMAL_BROWSER
box: 10 10 410 290
box: 5 5 385 290
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_BOTTOM
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: browser_credits
gravity: FL_NorthWest FL_SouthEast
name: browser_version
callback: C_FormBaseInputCB
argument: 0
=============== FORM ===============
Name: form_aboutlyx_license
Width: 430
Height: 310
Number of Objects: 3
Name: form_aboutlyx_credits
Width: 395
Height: 300
Number of Objects: 2
--------------------
class: FL_BOX
type: FLAT_BOX
box: 0 0 430 310
box: 0 0 395 300
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
@ -187,46 +128,70 @@ lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 10 410 100
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
class: FL_BROWSER
type: NORMAL_BROWSER
box: 5 5 385 290
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NorthWest FL_SouthEast
name: browser_credits
callback: C_FormBaseInputCB
argument: 0
=============== FORM ===============
Name: form_aboutlyx_license
Width: 395
Height: 300
Number of Objects: 2
--------------------
class: FL_BOX
type: FLAT_BOX
box: 0 0 395 300
boxtype: FL_FLAT_BOX
colors: FL_COL1 FL_COL1
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
lcol: FL_BLACK
label: Text
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_license
gravity: FL_NorthWest FL_SouthEast
name:
callback:
argument:
--------------------
class: FL_TEXT
type: NORMAL_TEXT
box: 10 120 410 180
boxtype: FL_FRAME_BOX
colors: FL_COL1 FL_MCOL
alignment: FL_ALIGN_CENTER|FL_ALIGN_INSIDE
class: FL_BROWSER
type: NORMAL_BROWSER
box: 5 5 385 290
boxtype: FL_DOWN_BOX
colors: FL_COL1 FL_YELLOW
alignment: FL_ALIGN_CENTER
style: FL_NORMAL_STYLE
size: FL_DEFAULT_SIZE
size: FL_NORMAL_SIZE
lcol: FL_BLACK
label: Text
label:
shortcut:
resize: FL_RESIZE_ALL
gravity: FL_NoGravity FL_NoGravity
name: text_warranty
callback:
argument:
gravity: FL_NorthWest FL_SouthEast
name: browser_license
callback: C_FormBaseInputCB
argument: 0
==============================
create_the_forms