Sorry guys, it's been really busy over here. Anyone want to take a
look at these (really old) patches that I found in my mailbox from a
while back?
---------- Forwarded message ----------
From: Olivier Rollet <o.rol...@gmail.com>
Date: 1 February 2010 10:17
Subject: Re: [Basket-devel] patch for consistency in font names when
editing tags
To: Kelvie Wong <kel...@ieee.org>
Hello,
I'm sending you the patches formatted with git forma-patch,
Regards,
Olivier Rollet
On Sat, Jan 30, 2010 at 7:54 PM, Kelvie Wong <kel...@ieee.org> wrote:
> 2010/1/26 Olivier Rollet <o.rol...@gmail.com>:
>> diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
>> index 17b231e..e1d5d18 100644
>> --- a/src/tagsedit.cpp
>> +++ b/src/tagsedit.cpp
>> @@ -1139,6 +1139,7 @@ void TagsEditDialog::ensureCurrentItemVisible()
>>
>> void TagsEditDialog::loadBlankState()
>> {
>> + QFont defaultFont;
>> m_stateName->setText("");
>> m_emblem->resetIcon();
>> m_removeEmblem->setEnabled(false);
>> @@ -1148,7 +1149,8 @@ void TagsEditDialog::loadBlankState()
>> m_italic->setChecked(false);
>> m_strike->setChecked(false);
>> m_textColor->setColor(QColor());
>> - m_font->setCurrentIndex(0);
>> + //m_font->setCurrentIndex(0);
>> + m_font->setCurrentFont(defaultFont.family());
>> m_fontSize->setCurrentIndex(0);
>> m_textEquivalent->setText("");
>> m_onEveryLines->setChecked(false);
>> @@ -1171,8 +1173,11 @@ void TagsEditDialog::loadStateFrom(State *state)
>> m_textEquivalent->setText(state->textEquivalent());
>> m_onEveryLines->setChecked(state->onAllTextLines());
>>
>> + QFont defaultFont;
>> +
>> if (state->fontName().isEmpty())
>> - m_font->setCurrentIndex(0);
>> + //m_font->setCurrentIndex(0);
>> + m_font->setCurrentFont(defaultFont.family());
>> else
>> m_font->setCurrentFont(state->fontName());
>>
>> ------------------------------------------------------------------------------
>> The Planet: dedicated and managed hosting, cloud storage, colocation
>> Stay online with enterprise data centers and the best network in the business
>> Choose flexible plans and management services without long-term contracts
>> Personal 24x7 support from experience hosting pros just a phone call away.
>> http://p.sf.net/sfu/theplanet-com
>> _______________________________________________
>> Basket-devel mailing list
>> Basket-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/basket-devel
>>
>
> Sorry for getting back to you so late; these patches look good.
>
> Could you make a commit (with a message), and use git format-patch to
> format patches, and send those instead?
>
> http://git-scm.com/ has instructions for doing so on the main page.
>
> Thanks.
> --
> Kelvie Wong
>
--
Kelvie Wong
From dc4865b4f1ae8f85d7c93a41432ed402714b09df Mon Sep 17 00:00:00 2001
From: Oliver Rollet <o.rol...@gmail.com>
Date: Wed, 27 Jan 2010 21:05:48 +0100
Subject: [PATCH 1/2] Bug patch - modifying font family in tagsedit
The signal textChanges is silently ignored on a QFontComboBox.
Replaced by currentFontChanged(const QFont&).
---
src/tagsedit.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index 17b231e..a55784d 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -618,7 +618,8 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT
connect(m_italic, SIGNAL(toggled(bool)), this, SLOT(modified()));
connect(m_strike, SIGNAL(toggled(bool)), this, SLOT(modified()));
connect(m_textColor, SIGNAL(activated(const QColor&)), this, SLOT(modified()));
- connect(m_font, SIGNAL(textChanged(const QString&)), this, SLOT(modified()));
+ //connect(m_font, SIGNAL(textChanged(const QString&)), this, SLOT(modified()));
+ connect(m_font, SIGNAL(currentFontChanged(const QFont&)), this, SLOT(modified()));
connect(m_fontSize, SIGNAL(textChanged(const QString&)), this, SLOT(modified()));
connect(m_textEquivalent, SIGNAL(textChanged(const QString&)), this, SLOT(modified()));
connect(m_onEveryLines, SIGNAL(stateChanged(int)), this, SLOT(modified()));
--
1.6.3.3
From b7a5baff383d8b48b31a51b574e34016e819db81 Mon Sep 17 00:00:00 2001
From: Olivier Rollet <o.rol...@gmail.com>
Date: Wed, 27 Jan 2010 21:19:25 +0100
Subject: [PATCH 2/2] Bug Patch - Consistency in font names
Font names in tagsedit and the note editor aren't the same when they
aren't saved in the tags.xml.
In tagsedit, that's the index(0) which is used (ie the first font
alphabetically) and in the note editor the correct default font the
system.
This is somewhat misleading => patch to use the default font in tagsedit
too.
---
src/tagsedit.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/tagsedit.cpp b/src/tagsedit.cpp
index a55784d..b9bf5f0 100644
--- a/src/tagsedit.cpp
+++ b/src/tagsedit.cpp
@@ -1140,6 +1140,7 @@ void TagsEditDialog::ensureCurrentItemVisible()
void TagsEditDialog::loadBlankState()
{
+ QFont defaultFont;
m_stateName->setText("");
m_emblem->resetIcon();
m_removeEmblem->setEnabled(false);
@@ -1149,7 +1150,8 @@ void TagsEditDialog::loadBlankState()
m_italic->setChecked(false);
m_strike->setChecked(false);
m_textColor->setColor(QColor());
- m_font->setCurrentIndex(0);
+ //m_font->setCurrentIndex(0);
+ m_font->setCurrentFont(defaultFont.family());
m_fontSize->setCurrentIndex(0);
m_textEquivalent->setText("");
m_onEveryLines->setChecked(false);
@@ -1172,8 +1174,9 @@ void TagsEditDialog::loadStateFrom(State *state)
m_textEquivalent->setText(state->textEquivalent());
m_onEveryLines->setChecked(state->onAllTextLines());
+ QFont defaultFont;
if (state->fontName().isEmpty())
- m_font->setCurrentIndex(0);
+ m_font->setCurrentFont(defaultFont.family() );
else
m_font->setCurrentFont(state->fontName());
--
1.6.3.3
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Basket-devel mailing list
Basket-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/basket-devel
