luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CONFIGURATION]

Browse source 
* NEW: Try 'libtoolize --nonrecursive' in the 'reconf' script.

[DEVELOPMENT ENVIRONMENT]
* BUG: Fix the orthograph of the "License" word in english and french.

[GB.FORM]
* BUG: Define the _MultiContainer property of ToolPanel and Wizard.

[GB.GTK]
* BUG: ComboBox cannot raise its click event recursively anymore.

[GB.QT]
* BUG: ComboBox cannot raise its click event recursively anymore.


git-svn-id: svn://localhost/gambas/trunk@2786 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2010-03-10 21:51:36 +00:00
parent c41cadb11f
commit 8c53bab42d
16 changed files with 288 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
app/src/gambas3/.lang/.pot
View file

@ -326,7 +326,7 @@ msgstr ""
#: CWelcome.class:66
msgid ""
"This program is published under\n"
"the GNU General Public Licence."
"the GNU General Public License."
msgstr ""
#: Design.module:220 Project.module:1663
@ -463,7 +463,7 @@ msgstr ""
msgid "Project commit"
msgstr ""
#: FCommit.class:195 FMakeInstall.class:1272 FPropertyProject.class:1640
#: FCommit.class:195 FMakeInstall.class:1268 FPropertyProject.class:1640
msgid "Description"
msgstr ""
@ -1168,7 +1168,7 @@ msgstr ""
msgid "Add expression"
msgstr ""
#: FDebugInfo.class:1073 FMakeInstall.class:1558 FPropertyProject.class:2159
#: FDebugInfo.class:1073 FMakeInstall.class:1539 FPropertyProject.class:2159
msgid "&Add"
msgstr ""
@ -1176,7 +1176,7 @@ msgstr ""
msgid "Remove current expression"
msgstr ""
#: FDebugInfo.class:1081 FMain.class:2411 FMakeInstall.class:1564
#: FDebugInfo.class:1081 FMain.class:2411 FMakeInstall.class:1545
#: FPropertyProject.class:1977
msgid "&Remove"
msgstr ""
@ -1981,11 +1981,11 @@ msgstr ""
msgid "&Delete"
msgstr ""
#: FList.class:288 FMakeInstall.class:1570
#: FList.class:288 FMakeInstall.class:1551
msgid "&Up"
msgstr ""
#: FList.class:294 FMakeInstall.class:1576
#: FList.class:294 FMakeInstall.class:1557
msgid "&Down"
msgstr ""
@ -2578,150 +2578,150 @@ msgstr ""
msgid "Package name"
msgstr ""
#: FMakeInstall.class:1204
#: FMakeInstall.class:1203
msgid "Prefix package name with the vendor name"
msgstr ""
#: FMakeInstall.class:1209
#: FMakeInstall.class:1208
msgid "Insert release number in package version"
msgstr ""
#: FMakeInstall.class:1217
#: FMakeInstall.class:1216
msgid "Maintainer information"
msgstr ""
#: FMakeInstall.class:1227
#: FMakeInstall.class:1226
msgid "Your name"
msgstr ""
#: FMakeInstall.class:1243
#: FMakeInstall.class:1241
msgid "Your e-mail address"
msgstr ""
#: FMakeInstall.class:1259
#: FMakeInstall.class:1256
msgid "Vendor name"
msgstr ""
#: FMakeInstall.class:1286
msgid "Licence"
#: FMakeInstall.class:1281
msgid "License"
msgstr ""
#: FMakeInstall.class:1293
msgid "General Public Licence"
#: FMakeInstall.class:1287
msgid "General Public License"
msgstr ""
#: FMakeInstall.class:1293
#: FMakeInstall.class:1287
msgid "Freeware"
msgstr ""
#: FMakeInstall.class:1293
#: FMakeInstall.class:1287
msgid "Public Domain"
msgstr ""
#: FMakeInstall.class:1293
msgid "Lesser General Public Licence"
#: FMakeInstall.class:1287
msgid "Lesser General Public License"
msgstr ""
#: FMakeInstall.class:1293
msgid "Other Licence(s)"
#: FMakeInstall.class:1287
msgid "Other License(s)"
msgstr ""
#: FMakeInstall.class:1293
msgid "Non-free Licence"
#: FMakeInstall.class:1287
msgid "Non-free License"
msgstr ""
#: FMakeInstall.class:1297
#: FMakeInstall.class:1291
msgid "Changelog"
msgstr ""
#: FMakeInstall.class:1302
#: FMakeInstall.class:1296
msgid "Please enter the changes of your project."
msgstr ""
#: FMakeInstall.class:1326
#: FMakeInstall.class:1317
msgid "Target distribution"
msgstr ""
#: FMakeInstall.class:1349
#: FMakeInstall.class:1339
msgid "Debian"
msgstr ""
#: FMakeInstall.class:1369
#: FMakeInstall.class:1358
msgid "Fedora"
msgstr ""
#: FMakeInstall.class:1389
#: FMakeInstall.class:1377
msgid "Mandriva Linux"
msgstr ""
#: FMakeInstall.class:1409
#: FMakeInstall.class:1396
msgid "OpenSUSE"
msgstr ""
#: FMakeInstall.class:1429
#: FMakeInstall.class:1415
msgid "Slackware"
msgstr ""
#: FMakeInstall.class:1449
#: FMakeInstall.class:1434
msgid "Ubuntu"
msgstr ""
#: FMakeInstall.class:1469
#: FMakeInstall.class:1453
msgid "Autotools"
msgstr ""
#: FMakeInstall.class:1474
#: FMakeInstall.class:1458
msgid "Package group"
msgstr ""
#: FMakeInstall.class:1495
#: FMakeInstall.class:1478
msgid "Menu entry"
msgstr ""
#: FMakeInstall.class:1518
#: FMakeInstall.class:1500
msgid "Categories"
msgstr ""
#: FMakeInstall.class:1528
#: FMakeInstall.class:1509
msgid "Extra dependencies"
msgstr ""
#: FMakeInstall.class:1532
#: FMakeInstall.class:1513
msgid "Same dependencies for all targets"
msgstr ""
#: FMakeInstall.class:1582
#: FMakeInstall.class:1563
msgid "&Clear"
msgstr ""
#: FMakeInstall.class:1588
#: FMakeInstall.class:1569
msgid "Extra files"
msgstr ""
#: FMakeInstall.class:1592
#: FMakeInstall.class:1573
msgid "Same files for all targets"
msgstr ""
#: FMakeInstall.class:1649
#: FMakeInstall.class:1630
msgid "Extra autoconf tests"
msgstr ""
#: FMakeInstall.class:1654
#: FMakeInstall.class:1635
msgid ""
"Add extra tests for the configuration process.\n"
"<p><b>Leave this blank if you don't need it, or if you don't know anything "
"about <i>autoconf</i> scripts.</b>"
msgstr ""
#: FMakeInstall.class:1673
#: FMakeInstall.class:1653
msgid "Create directories for each distribution"
msgstr ""
#: FMakeInstall.class:1676
#: FMakeInstall.class:1656
msgid "Create package"
msgstr ""
#: FMakeInstall.class:1681
#: FMakeInstall.class:1661
msgid ""
"All needed information have been collected. You can now create the "
"installation packages for your application...\n"

BIN
app/src/gambas3/.lang/fr.mo
View file

Binary file not shown.

310
app/src/gambas3/.lang/fr.po
View file

File diff suppressed because it is too large Load diff

2
app/src/gambas3/.src/CWelcome.class
View file

@ -63,7 +63,7 @@ Public Sub dwgWelcome_Draw()
PaintText("http://gambas.sourceforge.net", 12, 68, Color.SelectedForeground)
Paint.Font = Font["Bold,Italic,+2"]
PaintText(("This program is published under\nthe GNU General Public Licence."), 12, 104, Color.SelectedForeground)
PaintText(("This program is published under\nthe GNU General Public License."), 12, 104, Color.SelectedForeground)
End

4
app/src/gambas3/.src/Packager/FMakeInstall.class
View file

@ -60,7 +60,7 @@ Public Sub Form_Open()
If Project.License Then
txtLicense.Text = Project.License
Else
txtLicense.Text = "General Public Licence"
txtLicense.Text = "General Public License"
Endif
txtDescribe.Text = Project.Description
@ -78,7 +78,7 @@ Public Sub Form_Open()
cmbCategories.List = Split(File.Load("install/categories"), "\n", "", True)
txtLicense.List = ["General Public Licence", "Freeware", "Public Domain", "Lesser General Public Licence", "Other Licence(s)", "Non-Free Licence"]
txtLicense.List = ["General Public License", "Freeware", "Public Domain", "Lesser General Public License", "Other License(s)", "Non-Free License"]
If Project.CreateComponent Then
chkPrefix.Value = True

25
app/src/gambas3/.src/Packager/FMakeInstall.form
View file

@ -26,7 +26,6 @@
MoveScaled(1,5,70,4)
Font = Font["Bold,+2"]
AutoResize = True
Text = ("")
Border = Border.Sunken
}
{ VBox1 VBox
@ -57,7 +56,6 @@
{ txtName TextBox
MoveScaled(24,0,44,4)
Expand = True
Text = ("")
}
}
{ HBox2 HBox
@ -70,7 +68,6 @@
{ txtMail TextBox
MoveScaled(24,0,44,4)
Expand = True
Text = ("")
}
}
{ HBox8 HBox
@ -83,7 +80,6 @@
{ txtVendor TextBox
MoveScaled(24,0,44,4)
Expand = True
Text = ("")
}
}
{ Label6 Label
@ -95,19 +91,17 @@
{ txtDescribe TextArea
MoveScaled(1,42,71,14)
Expand = True
Text = ("")
Wrap = True
}
{ Label5 Label
MoveScaled(1,56,70,4)
Font = Font["Bold"]
Text = ("Licence")
Text = ("License")
Alignment = Align.BottomNormal
}
{ txtLicense ComboBox
MoveScaled(1,61,71,4)
Text = ("")
List = [("General Public Licence"), ("Freeware"), ("Public Domain"), ("Lesser General Public Licence"), ("Other Licence(s)"), ("Non-free Licence")]
List = [("General Public License"), ("Freeware"), ("Public Domain"), ("Lesser General Public License"), ("Other License(s)"), ("Non-free License")]
Sorted = True
}
Index = 1
@ -121,17 +115,14 @@
MoveScaled(1,5,68,4)
Font = Font["Bold"]
AutoResize = True
Text = ("")
}
{ txtChange TextArea
MoveScaled(1,10,68,11)
Text = ("")
Wrap = True
}
{ txtChangeLog TextArea
MoveScaled(1,22,68,27)
Expand = True
Text = ("")
ReadOnly = True
Wrap = True
}
@ -148,7 +139,6 @@
Padding = 4
{ ToolButton3 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/debian.png"]
Toggle = True
}
@ -165,7 +155,6 @@
Padding = 4
{ ToolButton4 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/fedora.png"]
Toggle = True
}
@ -182,7 +171,6 @@
Padding = 4
{ ToolButton2 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/mandriva.png"]
Toggle = True
}
@ -199,7 +187,6 @@
Padding = 4
{ ToolButton5 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/suse.png"]
Toggle = True
}
@ -216,7 +203,6 @@
Padding = 4
{ ToolButton1 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/slackware.png"]
Toggle = True
}
@ -233,7 +219,6 @@
Padding = 4
{ ToolButton6 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/ubuntu.png"]
Toggle = True
}
@ -250,7 +235,6 @@
Padding = 4
{ ToolButton7 ToolButton
MoveScaled(0,0,8,8)
Text = ("")
Picture = Picture["img/logo/package-gnu.png"]
Toggle = True
}
@ -276,7 +260,6 @@
}
{ txtGroup TextBox
MoveScaled(1,47,68,4)
Text = ("")
ReadOnly = True
}
Index = 4
@ -293,7 +276,6 @@
}
{ txtMenu TextBox
MoveScaled(1,39,68,4)
Text = ("")
ReadOnly = True
}
{ Label4 Label
@ -304,7 +286,6 @@
}
{ cmbCategories ComboBox
MoveScaled(1,48,68,4)
Text = ("")
Sorted = True
}
Index = 5
@ -418,7 +399,6 @@
{ txtTests TextArea
MoveScaled(1,15,71,49)
Expand = True
Text = ("")
}
Index = 8
Text = ("Destination directory")
@ -442,7 +422,6 @@
MoveScaled(1,21,68,33)
Font = Font["Monospace"]
Expand = True
Text = ("")
ReadOnly = True
Wrap = True
}

8
comp/src/gb.form/.info
View file

@ -1438,6 +1438,10 @@ _Similar
C
s
TabStrip
_IsMultiContainer
C
b
-1
:Click
:
@ -1636,6 +1640,10 @@ _Similar
C
s
TabStrip
_IsMultiContainer
C
b
-1
:BeforeChange
:

2
comp/src/gb.form/.lang/.pot
View file

@ -216,6 +216,6 @@ msgstr ""
msgid "The '/' character is forbidden inside file or directory names."
msgstr ""
#: Wizard.class:75
#: Wizard.class:76
msgid "Step #&1"
msgstr ""

2
comp/src/gb.form/.project
View file

@ -1,5 +1,5 @@
# Gambas Project File 3.0
# Compiled with Gambas 2.99.0 (r2743)
# Compiled with Gambas 2.99.0 (r2774)
Startup=FMain
StackTrace=1
Version=2.99.0

1
comp/src/gb.form/.src/ToolPanel.class
View file

@ -7,6 +7,7 @@ Inherits UserContainer
Public Const _Properties As String = "*,Count{Range:1;256}=1,Index,Text,TextFont,Picture,Animated,Border"
Public Const _Similar As String = "TabStrip"
Public Const _IsMultiContainer As Boolean = True
Event Click

1
comp/src/gb.form/.src/Wizard.class
View file

@ -6,6 +6,7 @@ Inherits UserContainer
Public Const _Properties As String = "*,Count{Range:1;256}=1,Index,Text,Picture,ShowTitle=True,ShowIndex=False,Border=True"
Public Const _DefaultEvent As String = "Change"
Public Const _Similar As String = "TabStrip"
Public Const _IsMultiContainer As Boolean = True
Event BeforeChange
Event Change

16
gb.gtk/src/CTextBox.cpp
View file

@ -54,12 +54,6 @@ static void txt_raise_activate(gTextBox *sender)
GB.Raise(THIS, EVENT_Activate, 0);
}
static void cmb_raise_click(gComboBox *sender)
{
CWIDGET *_object = GetObject((gControl*)sender);
GB.Raise(THIS, EVENT_Click, 0);
}
/***************************************************************************
TextBox
@ -234,6 +228,16 @@ END_METHOD
#undef THIS
#define THIS ((CCOMBOBOX *)_object)
static void cmb_raise_click(gComboBox *sender)
{
CWIDGET *_object = GetObject((gControl*)sender);
if (THIS->click)
return;
THIS->click = true;
GB.Raise(THIS, EVENT_Click, 0);
THIS->click = false;
}
BEGIN_METHOD(CCOMBOBOX_new, GB_OBJECT parent)

1
gb.gtk/src/CTextBox.h
View file

@ -54,6 +54,7 @@ typedef
{
CWIDGET ob;
int index;
bool click;
}
CCOMBOBOX;

107
gb.qt4/src/CTextBox.cpp
View file

@ -1,22 +1,22 @@
/***************************************************************************
CTextBox.cpp
CTextBox.cpp
(c) 2000-2009 Benoît Minisini <gambas@users.sourceforge.net>
(c) 2000-2009 Benoît Minisini <gambas@users.sourceforge.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
***************************************************************************/
@ -330,6 +330,16 @@ END_METHOD
#undef THIS
#define THIS OBJECT(CCOMBOBOX)
static void raise_click_event(void *_object)
{
if (THIS->click)
return;
THIS->click = true;
GB.Raise(THIS, EVENT_Click, 0);
THIS->click = false;
}
static int combo_get_current_item(void *_object)
{
COMBOBOX->sort();
@ -346,8 +356,8 @@ static void combo_set_current_item(void *_object, int item)
COMBOBOX->setCurrentItem(item);
}
if (item >= 0 && !COMBOBOX->signalsBlocked())
GB.Raise(THIS, EVENT_Click, 0);
if (item >= 0 && !COMBOBOX->signalsBlocked())
raise_click_event(THIS);
}
static void combo_set_editable(void *_object, bool ed)
@ -385,13 +395,13 @@ static void combo_set_editable(void *_object, bool ed)
static int combo_find_item(void *_object, const QString& s)
{
COMBOBOX->sort();
for (int i = 0; i < (int)COMBOBOX->count(); i++)
{
if (COMBOBOX->text(i) == s)
return i;
}
for (int i = 0; i < (int)COMBOBOX->count(); i++)
{
if (COMBOBOX->text(i) == s)
return i;
}
return (-1);
return (-1);
}
@ -413,8 +423,8 @@ static void combo_set_list(void *_object, GB_ARRAY array)
{
int i;
COMBOBOX->blockSignals(true);
COMBOBOX->clear();
COMBOBOX->blockSignals(true);
COMBOBOX->clear();
if (array)
{
@ -425,7 +435,7 @@ static void combo_set_list(void *_object, GB_ARRAY array)
}
COMBOBOX->setDirty();
COMBOBOX->blockSignals(false);
COMBOBOX->blockSignals(false);
//if (COMBOBOX->count())
// GB.Raise(THIS, EVENT_Click, 0);
@ -440,8 +450,6 @@ BEGIN_METHOD(CCOMBOBOX_new, GB_OBJECT parent)
QObject::connect(wid, SIGNAL(editTextChanged(const QString &)), &CTextBox::manager, SLOT(onChange()));
QObject::connect(wid, SIGNAL(activated(int)), &CTextBox::manager, SLOT(onClick()));
//QObject::connect(wid, SIGNAL(highlighted(int)), &CTextBox::manager, SLOT(event_click()));
wid->setInsertPolicy(QComboBox::NoInsert);
CWIDGET_new(wid, (void *)_object);
@ -480,7 +488,7 @@ BEGIN_PROPERTY(CCOMBOBOX_text)
COMBOBOX->lineEdit()->setText(text);
pos = combo_find_item(THIS, text);
combo_set_current_item(_object, pos);
combo_set_current_item(_object, pos);
}
END_PROPERTY
@ -541,11 +549,11 @@ BEGIN_METHOD(CCOMBOBOX_add, GB_STRING item; GB_INTEGER pos)
int index;
int pos = VARGOPT(pos, -1);
COMBOBOX->blockSignals(true);
COMBOBOX->blockSignals(true);
index = combo_get_current_item(THIS);
if (pos < 0 || pos >= COMBOBOX->count())
pos = -1;
if (pos < 0 || pos >= COMBOBOX->count())
pos = -1;
if (pos < 0)
COMBOBOX->addItem(QSTRING_ARG(item));
@ -559,7 +567,7 @@ BEGIN_METHOD(CCOMBOBOX_add, GB_STRING item; GB_INTEGER pos)
else
combo_set_current_item(THIS, 0);
COMBOBOX->blockSignals(false);
COMBOBOX->blockSignals(false);
END_METHOD
@ -593,17 +601,17 @@ END_PROPERTY
BEGIN_PROPERTY(CCOMBOBOX_index)
if (READ_PROPERTY)
GB.ReturnInteger(combo_get_current_item(THIS));
else
combo_set_current_item(THIS, VPROP(GB_INTEGER));
if (READ_PROPERTY)
GB.ReturnInteger(combo_get_current_item(THIS));
else
combo_set_current_item(THIS, VPROP(GB_INTEGER));
END_PROPERTY
BEGIN_PROPERTY(CCOMBOBOX_current)
THIS->index = combo_get_current_item(THIS);
THIS->index = combo_get_current_item(THIS);
if (THIS->index < 0)
GB.ReturnNull();
@ -631,25 +639,25 @@ END_METHOD
BEGIN_METHOD(CCOMBOBOX_find, GB_STRING item)
GB.ReturnInteger(combo_find_item(THIS, QSTRING_ARG(item)));
GB.ReturnInteger(combo_find_item(THIS, QSTRING_ARG(item)));
END_METHOD
BEGIN_PROPERTY(CCOMBOBOX_list)
GB_ARRAY array;
if (READ_PROPERTY)
{
GB.Array.New(&array, GB_T_STRING, COMBOBOX->count());
combo_get_list(THIS, array);
GB.ReturnObject(array);
GB_ARRAY array;
if (READ_PROPERTY)
{
GB.Array.New(&array, GB_T_STRING, COMBOBOX->count());
combo_get_list(THIS, array);
GB.ReturnObject(array);
}
else
{
combo_set_list(THIS, (GB_ARRAY)VPROP(GB_OBJECT));
}
else
{
combo_set_list(THIS, (GB_ARRAY)VPROP(GB_OBJECT));
}
END_PROPERTY
@ -723,7 +731,8 @@ void CTextBox::onActivate(void)
void CTextBox::onClick()
{
RAISE_EVENT(EVENT_Click);
GET_SENDER();
raise_click_event(THIS);
}

1
gb.qt4/src/CTextBox.h
View file

@ -56,6 +56,7 @@ typedef
struct {
CWIDGET widget;
int index;
bool click;
}
CCOMBOBOX;

2
reconf
View file

@ -3,6 +3,6 @@
rm -f config.cache
rm -f acconfig.cache
libtoolize --force --copy
libtoolize --force --copy --nonrecursive
autoreconf -v --install $@