Writer

Merge lp://staging/~gustavoxdgame1/writer/make-BugFix into lp://staging/writer

  1. make-BugFix
  2. Merge into trunk
Proposed by LinX
Status: Needs review
Proposed branch: lp://staging/~gustavoxdgame1/writer/make-BugFix
Merge into: lp://staging/writer
Diff against target: 9080 lines (+8355/-0) (has conflicts)
134 files modified
AUTHORS (+2/-0)
CMakeLists.txt (+91/-0)
INSTALL (+18/-0)
Writer.avprj (+5/-0)
cmake/CMakeLists.txt (+17/-0)
cmake/FindVala.cmake (+80/-0)
cmake/FindValadoc.cmake (+20/-0)
cmake/GObjectIntrospectionMacros.cmake (+34/-0)
cmake/GSettings.cmake (+42/-0)
cmake/Makefile (+286/-0)
cmake/ParseArguments.cmake (+36/-0)
cmake/README (+10/-0)
cmake/README.Vala.rst (+173/-0)
cmake/Tests.cmake (+5/-0)
cmake/Translations.cmake (+66/-0)
cmake/ValaPrecompile.cmake (+237/-0)
cmake/ValaVersion.cmake (+152/-0)
cmake/Valadoc.cmake (+38/-0)
data/CMakeLists.txt (+25/-0)
data/icons/format-indent-less-symbolic.svg (+111/-0)
data/icons/format-indent-more-symbolic.svg (+111/-0)
data/icons/format-justify-center-symbolic.svg (+19/-0)
data/icons/format-justify-fill-symbolic.svg (+19/-0)
data/icons/format-justify-left-symbolic.svg (+19/-0)
data/icons/format-justify-right-symbolic.svg (+21/-0)
data/icons/format-text-bold-symbolic.svg (+18/-0)
data/icons/format-text-italic-symbolic.svg (+17/-0)
data/icons/format-text-strikethrough-symbolic.svg (+18/-0)
data/icons/format-text-underline-symbolic.svg (+18/-0)
data/main_icons/128/writer.svg (+673/-0)
data/main_icons/16/writer.svg (+674/-0)
data/main_icons/24/writer.svg (+674/-0)
data/main_icons/32/writer.svg (+674/-0)
data/main_icons/48/writer.svg (+674/-0)
data/main_icons/64/writer.svg (+674/-0)
data/writer.desktop (+9/-0)
po/CMakeLists.txt (+5/-0)
po/af.po (+4/-0)
po/am.po (+4/-0)
po/ar.po (+4/-0)
po/ast.po (+4/-0)
po/az.po (+4/-0)
po/be.po (+4/-0)
po/bg.po (+4/-0)
po/bn.po (+4/-0)
po/bs.po (+4/-0)
po/ca.po (+4/-0)
po/ckb.po (+4/-0)
po/cs.po (+4/-0)
po/da.po (+4/-0)
po/de.po (+4/-0)
po/el.po (+4/-0)
po/en_AU.po (+4/-0)
po/en_CA.po (+4/-0)
po/en_GB.po (+4/-0)
po/eo.po (+4/-0)
po/es.po (+4/-0)
po/et.po (+4/-0)
po/eu.po (+4/-0)
po/fa.po (+4/-0)
po/fi.po (+4/-0)
po/fr.po (+4/-0)
po/fr_CA.po (+4/-0)
po/gl.po (+4/-0)
po/he.po (+4/-0)
po/hi.po (+4/-0)
po/hr.po (+4/-0)
po/hu.po (+4/-0)
po/hy.po (+4/-0)
po/id.po (+4/-0)
po/it.po (+4/-0)
po/ja.po (+4/-0)
po/ka.po (+4/-0)
po/ko.po (+4/-0)
po/ky.po (+4/-0)
po/lb.po (+4/-0)
po/lo.po (+4/-0)
po/lt.po (+4/-0)
po/lv.po (+4/-0)
po/ml.po (+4/-0)
po/mr.po (+4/-0)
po/ms.po (+4/-0)
po/nb.po (+4/-0)
po/nl.po (+4/-0)
po/nn.po (+4/-0)
po/pl.po (+4/-0)
po/pt.po (+4/-0)
po/pt_BR.po (+4/-0)
po/ro.po (+4/-0)
po/ru.po (+4/-0)
po/rue.po (+4/-0)
po/si.po (+4/-0)
po/sk.po (+4/-0)
po/sl.po (+4/-0)
po/sma.po (+4/-0)
po/sq.po (+4/-0)
po/sr.po (+4/-0)
po/sv.po (+4/-0)
po/sw.po (+4/-0)
po/ta.po (+4/-0)
po/te.po (+4/-0)
po/th.po (+4/-0)
po/tr.po (+4/-0)
po/uk.po (+4/-0)
po/vi.po (+4/-0)
po/zh_CN.po (+4/-0)
po/zh_HK.po (+4/-0)
po/zh_TW.po (+4/-0)
scripts/build.sh (+18/-0)
scripts/install (+55/-0)
scripts/install.sh (+55/-0)
scripts/only-run.sh (+3/-0)
scripts/run.sh (+21/-0)
scripts/uninstall.sh (+49/-0)
src/MainWindow.vala (+134/-0)
src/Utils/Document.vala (+53/-0)
src/Utils/FileChooser.vala (+59/-0)
src/Utils/Stylesheet.vala (+67/-0)
src/Utils/TextEditor.vala (+342/-0)
src/Utils/TextRange.vala (+295/-0)
src/Utils/ZeitgeistLogger.vala (+116/-0)
src/Widgets/ButtonGroup.vala (+37/-0)
src/Widgets/EditorView.vala (+54/-0)
src/Widgets/ImageToolBar.vala (+94/-0)
src/Widgets/TableChooser.vala (+78/-0)
src/Widgets/TableToolBar.vala (+147/-0)
src/Widgets/TextToolBar.vala (+226/-0)
src/Widgets/TitleBar.vala (+112/-0)
src/Widgets/ToolBar.vala (+62/-0)
src/Widgets/WelcomeView.vala (+54/-0)
src/Writer.vala (+150/-0)
src/config.vala (+9/-0)
src/config.vala.cmake (+9/-0)
src/desktop-launcher.vala (+7/-0)
Conflict adding file AUTHORS.  Moved existing file to AUTHORS.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file INSTALL.  Moved existing file to INSTALL.moved.
Conflict adding file Writer.avprj.  Moved existing file to Writer.avprj.moved.
Conflict adding file cmake.  Moved existing file to cmake.moved.
Conflict adding file data.  Moved existing file to data.moved.
Conflict adding file doc.  Moved existing file to doc.moved.
Conflict adding file po.  Moved existing file to po.moved.
Conflict adding file scripts.  Moved existing file to scripts.moved.
Conflict adding file src.  Moved existing file to src.moved.
To merge this branch: bzr merge lp://staging/~gustavoxdgame1/writer/make-BugFix
Reviewer Review Type Date Requested Status
Anthony Huben Disapprove
Review via email: mp+244523@code.staging.launchpad.net

Commit message

Ok,this is all the writer folder + changes

Description of the change

add an empty file in Utils and CMakeLists.txt to make loading the Document.vala

To post a comment you must log in.
Revision history for this message
Tuur Dutoit (tuur-dutoit-f) wrote :

This is something for Anthony Huben.

Reply
Revision history for this message
Anthony Huben (harp37) wrote :

It finally works! Yes! We can all sleep at night! Haha.

There are three warnings that need fixing before we are perfect, and this has to do with using "Gtk.Stock":

/home/tony/projects/make-BugFix/src/Utils/FileChooser.vala:36.28-36.36: warning: Gtk.Stock has been deprecated since 3.10
/home/tony/projects/make-BugFix/src/Utils/FileChooser.vala:38.32-38.40: warning: Gtk.Stock has been deprecated since 3.10
/home/tony/projects/make-BugFix/src/Utils/FileChooser.vala:40.32-40.40: warning: Gtk.Stock has been deprecated since 3.10

Please fix these, and add these to this branch.

Reply
Revision history for this message
Anthony Huben (harp37) wrote :

Oh, and resubmit against the latest branch. There are conflicts that addressing first. Sorry. I forgot to mention that.

Reply
Revision history for this message
Anthony Huben (harp37) wrote :

sudo make install does not work:
- installs to /usr. folder instead.
- does not show icon

Three warnings should be fixed
- regarding "Gtk-stock"

Conflicts would make this merge messy.
- re-base off of existing code. Do each change by hand. One at a time!

Little tweaks to coding style
- follow the Elementary Code Guidelines. Don't try to use ours. http://elementaryos.org/docs/code

review: Needs Resubmitting (building)
Reply
Revision history for this message
Anthony Huben (harp37) wrote :

I resubmitted your changes because you didn't resubmit mergeable code.

review: Disapprove
Reply

Unmerged revisions

1. By LinX <email address hidden>

Make Bug Fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: