← Back to branch summary

~ubuntu-branches/ubuntu/utopic/rlvm/utopic-proposed

« back to all changes in this revision

Viewing changes to src/Systems/Base/TextWakuNormal.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Ying-Chun Liu (PaulLiu), Ying-Chun Liu (PaulLiu), Elliot Glaysher
  • Date: 2011-05-19 00:28:44 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20110519002844-qszwmj7oiixww0eg
Tags: 0.12-1
[ Ying-Chun Liu (PaulLiu) <paulliu@debian.org> ]
* New upstream release

[ Elliot Glaysher <glaysher@umich.edu> ]
* New GTK+ interface with desktop integration and UI refinements
* Partial Japanese localizations
* Fix graphics corruption in in-game dialogs when a dialog is brought
  up, and then fullscreen mode activated
* Smooth the output of text in rlBabel using games
* Don't play voice samples while fast forwarding

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Systems/Base/TextWakuNormal.cpp
21
21
//
22
22
// You should have received a copy of the GNU General Public License
23
23
// along with this program; if not, write to the Free Software
24
 
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
24
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
25
25
// -----------------------------------------------------------------------
26
26
 
27
27
#include "Systems/Base/TextWakuNormal.hpp"
233
233
        new ActivationTextWindowButton(
234
234
            system_,
235
235
            ts.windowReadJumpUse(), waku("READJUMP_BOX"),
236
 
            bind(&TextSystem::setSkipMode, ref(ts), true),
237
 
            bind(&TextSystem::setSkipMode, ref(ts), false));
 
236
            bind(&TextSystem::setSkipMode, ref(ts), _1));
 
237
    readjump_box->setEnabledNotification(
 
238
        NotificationType::SKIP_MODE_ENABLED_CHANGED);
 
239
    readjump_box->setChangeNotification(
 
240
        NotificationType::SKIP_MODE_STATE_CHANGED);
 
241
 
 
242
    // Set the initial enabled state. If true, we'll get a signal enabling it
 
243
    // immediately.
 
244
    readjump_box->setEnabled(ts.kidokuRead());
 
245
 
238
246
    button_map_[10].reset(readjump_box);
239
 
    ts.skipModeSignal().connect(bind(&ActivationTextWindowButton::setActivated,
240
 
                                     readjump_box, _1));
241
 
    ts.skipModeEnabledSignal().connect(
242
 
        bind(&ActivationTextWindowButton::setEnabled, readjump_box, _1));
243
247
  }
244
248
 
245
249
  if (waku("AUTOMODE_BOX").exists()) {
247
251
        new ActivationTextWindowButton(
248
252
            system_,
249
253
            ts.windowAutomodeUse(), waku("AUTOMODE_BOX"),
250
 
            bind(&TextSystem::setAutoMode, ref(ts), true),
251
 
            bind(&TextSystem::setAutoMode, ref(ts), false));
 
254
            bind(&TextSystem::setAutoMode, ref(ts), _1));
 
255
    automode_button->setChangeNotification(
 
256
        NotificationType::AUTO_MODE_STATE_CHANGED);
 
257
 
252
258
    button_map_[11].reset(automode_button);
253
 
    ts.autoModeSignal().connect(bind(&ActivationTextWindowButton::setActivated,
254
 
                                     automode_button, _1));
255
259
  }
256
260
 
257
261
  /*