Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

New layout, added Material design, and shortcuts #254

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

lt-mayonesa
Copy link

Following #252 impulse i submit thee

Changes appearing in diff for following directories were made when i merged upstream, i did not modify them:

  • backend
  • db
  • locale

Features

  • Zoom In & Out
  • Shortcuts
  • Improved UI/UX (i hope)

Changes

  • Mainly edited index.html and style.css for layout
  • And .js files like row, rowmanager, wwwsqldesigner
  • some .js appear modified but are only because Netbeans uses a different code format (sorry for that)

Hope you like it 馃槃

Merge origin/master

Conflicts:
	README.md
	backend/asp-file/Default.aspx
	backend/asp-file/Default.aspx.cs
	backend/cf-mysql/index.cfm
	backend/perl-file/index.pl
	backend/php-cubrid/cubrid_mysql_compat.php
	backend/php-cubrid/index.php
	backend/php-file/index.php
	backend/php-mysql+file/index.php
	backend/php-mysql+file/mysql_import.php
	backend/php-mysql/index.php
	backend/php-pdo/LayerMYSQL.php
	backend/php-pdo/LayerPGSQL.php
	backend/php-pdo/index.php
	backend/php-postgresql/index.php
	db/cubrid/datatypes.xml
	db/cubrid/output.xsl
	db/mssql/output.xsl
	db/mysql/datatypes.xml
	db/mysql/output.xsl
	db/oracle/datatypes.xml
	db/oracle/output.xsl
	db/postgresql/output.xsl
	db/sqlalchemy/datatypes.xml
	db/sqlalchemy/output.xsl
	db/sqlite/output.xsl
	db/vfp9/datatypes.xml
	db/vfp9/output.xsl
	dropbox-oauth-receiver.html
	index.html
	js/config.js
	js/globals.js
	js/io.js
	js/keymanager.js
	js/map.js
	js/options.js
	js/oz.js
	js/relation.js
	js/row.js
	js/rowmanager.js
	js/rubberband.js
	js/table.js
	js/tablemanager.js
	js/toggle.js
	js/window.js
	js/wwwsqldesigner.js
	locale/cs.xml
	locale/de.xml
	locale/el.xml
	locale/en.xml
	locale/eo.xml
	locale/es.xml
	locale/fr.xml
	locale/hu.xml
	locale/it.xml
	locale/ja.xml
	locale/nl.xml
	locale/pl.xml
	locale/pt_BR.xml
	locale/ro.xml
	locale/sv.xml
	locale/zh.xml
	styles/style.css
@lt-mayonesa lt-mayonesa changed the title Changed layout, added Material design, and shortcuts New layout, added Material design, and shortcuts May 26, 2017
@ondras
Copy link
Owner

ondras commented May 29, 2017

Wow, this looks huge 馃憤

I am extremely busy these days, so please give me some time so I can thoroughly review this PR and decide whether this redesign is consistent with my intentions of maintaining the app. If I do not reply within say 1-2 weeks, feel free to ping me again ;-)

@teo-sk
Copy link

teo-sk commented Aug 9, 2017

@ondras I'm taking the liberty of pinging you again :) This one looks nice.

@ondras
Copy link
Owner

ondras commented Aug 9, 2017

@ondras I'm taking the liberty of pinging you again :) This one looks nice.

Thanks!

I am now on a vacation. Will be returning back to civilization at 27.8., so after that I will try to find some time to merge this.

@slothbag
Copy link

Can we have this as a selectable style? I think I prefer the simplicity of the original UI

@ondras
Copy link
Owner

ondras commented Aug 29, 2017

Can we have this as a selectable style? I think I prefer the simplicity of the original UI

This sounds like a very reasonable request. Ideally, the styling should happen via CSS switching (only).

@ondras
Copy link
Owner

ondras commented Aug 29, 2017

So, I just skimmed through the diff. It is huge and we will have to split the changeset in order to merge it meaningfully.

I suggest doing this in the following manner:

  1. applying only those changes that are related to your editor, i.e. newlines, indents etc. This commit will not modify the app at all.

  2. applying changes that are related to behavior, i.e. keyboard controls (are there any other interaction modifications?).

  3. applying changes that are related to styling. Ideally, this should happen exclusively via CSS. If the underlying HTML needs to be adjusted, I would like to have to current CSS updated as well, so that the material design can be kept around as a skin, self-contained using a separate stylesheet (and images).

The first point might be doable simply by opening the current codebase in your editor, re-saving (re-formatting) every file and commiting into a new branch. If this works, you can then merge this re-formatted branch into your redesign, reducing the size of your current PR.

@lt-mayonesa
Copy link
Author

Hey, sorry i couldn't answer sooner.

Soo, i didn't really code this re-design with "polite" merging in mind (or merging for that matter) :/ so i don't know if points 2 and 3 will be that straightforward.
Let me see if i can get some time in my hands to think about it, and also do it 馃槃

About the formatting, if i roll back to your formatting, wouldn't that be easier? am i missing a reason why not to?

@CyrilCharlier
Copy link

hello no news from this PR ?

@ondras
Copy link
Owner

ondras commented May 12, 2018

hello no news from this PR ?

Yeah, no news, unfortunately. The PR is simply too large and destructive with respect to current codebase, so merging it seems to be a one-way transition with no means of going back (for example: people who, for some reason, might prefer the old way).

If you absolutely need the functionality/design provided in the PR, feel free to fork this project and apply relevant changesets to your repo.

@CyrilCharlier
Copy link

No need "absolutely" but a new look and feel (but with backward compatibility) is a good think :)

@pickfire
Copy link

Any news on this?

@ondras
Copy link
Owner

ondras commented Aug 26, 2019

Yes :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants